[Packages] net/autossh: Update to 1.4b

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

diff --git a/net/miredo/Makefile b/net/miredo/Makefile
index 4456f779834d04e263f7bb45f5c3a4841f2f1eaa..9753fd60740e06f626b0dab2ffd3f5f001ec9e64 100644 (file)
--- a/net/miredo/Makefile
+++ b/net/miredo/Makefile
@@ -11,30 +11,24 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=miredo
 PKG_VERSION:=1.0.0
 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:=b5a51cb98732decc2ada96b2caee5d3c
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/miredo
+define Package/miredo/Default
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=+libpthread +uclibcxx +kmod-ipv6 +kmod-tun
-  SUBMENU:=Teredo (IPv6 tunneling over UDP through NAT) client and relay daemon
-  DESCRIPTION:=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 +36,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 +53,15 @@ $(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 \
+
+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)" \
@@ -83,7 +74,7 @@ define Package/miredo-server/install
        $(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   
@@ -92,7 +83,7 @@ define Package/miredo-client/install
        $(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))