[package] fix location of miredo sample configuration files, patch from Russell Senior

[openwrt/svn-archive/archive.git] / net / miredo / Makefile

diff --git a/net/miredo/Makefile b/net/miredo/Makefile
index f42d933fa3bc2eb6fbf01e2db21c36f73a7e926e..04d6528f25d992d6bc9b6a774624f78869f4c75c 100644 (file)
--- a/net/miredo/Makefile
+++ b/net/miredo/Makefile
@@ -4,37 +4,30 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miredo
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.1.6
 PKG_RELEASE:=1
-PKG_MD5SUM:=b5a51cb98732decc2ada96b2caee5d3c
 
 PKG_SOURCE_URL:=http://www.remlab.net/files/miredo/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_CAT:=bzcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=bf49c1ddc068746760787d0cf76e40de
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/miredo
+define Package/miredo/Default
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=+libpthread +uclibcxx +kmod-ipv6 +kmod-tun
-  SUBMENU:=miredo - Teredo (IPv6 tunneling over UDP through NAT) client and relay daemon
-  DESCRIPTION:=miredo - A Teredo (IPv6 tunneling over UDP through NAT) client and relay daemon.
+  SUBMENU:=miredo: Teredo (IPv6 tunneling over UDP through NAT)
   URL:=http://www.simphalempin.com/dev/miredo/
 endef
 
 define Package/miredo-server
-  $(call Package/miredo)
+$(call Package/miredo/Default)
   TITLE:=Teredo (IPv6 tunneling over UDP through NAT) server daemon
-  DESCRIPTION:=A Teredo (IPv6 tunneling over UDP through NAT) server daemon.
 endef
 
 define Package/miredo-server/conffiles
@@ -42,17 +35,16 @@ define Package/miredo-server/conffiles
 endef
 
 define Package/miredo-client
-  $(call Package/miredo)
+$(call Package/miredo/Default)
   TITLE:=Teredo (IPv6 tunneling over UDP through NAT) client and relay daemon
-  DESCRIPTION:=Teredo (IPv6 tunneling over UDP through NAT) client and relay daemon
 endef
 
 define Package/miredo-client/conffiles
 /etc/miredo.conf
 endef
 
-define Build/Configure 
-$(call Build/Configure/Default,--disable-shared \
+CONFIGURE_ARGS += \
+       --disable-shared \
        --enable-static \
        --with-gnu-ld \
        --disable-rpath \
@@ -60,17 +52,16 @@ $(call Build/Configure/Default,--disable-shared \
        --enable-teredo-client \
        --enable-teredo-relay \
        --enable-teredo-server \
-       --enable-miredo-user=root,CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++"  \
-       CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-       LDFLAGS="-nodefaultlibs -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-       LIBS="-luClibc++ -lc -lm" \
+       --enable-miredo-user=root \
+       --without-Judy \
+
+CONFIGURE_VARS += \
+       CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \
+       CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \
+       LIBS="-nodefaultlibs -luClibc++ -lm" \
        ac_cv_file__proc_self_maps=yes\
-)
-endef
 
 define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CXXLINK="\$$$$(LINK)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
@@ -79,20 +70,20 @@ endef
 
 define Package/miredo-server/install
        $(INSTALL_DIR) $(1)/etc/
-       $(CP) $(PKG_INSTALL_DIR)/etc/miredo-server.conf-dist $(1)/etc/miredo-server.conf
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/miredo/examples/miredo-server.conf $(1)/etc/miredo-server.conf
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/miredo-server.init $(1)/etc/init.d/miredo-server
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/miredo-server $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/miredo-server $(1)/usr/sbin/
 endef
 
 define Package/miredo-client/install   
        $(INSTALL_DIR) $(1)/etc
-       $(CP) $(PKG_INSTALL_DIR)/etc/miredo.conf-dist $(1)/etc/miredo.conf
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/miredo/examples/miredo.conf $(1)/etc/miredo.conf
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/miredo.init $(1)/etc/init.d/miredo
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/miredo $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/miredo $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,miredo-server))