X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=net%2Fminiupnpd%2FMakefile;h=73e041a6f3b4cd25e7e0f2b57e483879d03d2277;hp=da0a8f489602d554aeb6554a0836712bad77c919;hb=c4116e584c68203c375df2c75fc06b61f12985cd;hpb=a4d4891a11a74e6d02ee2f76355a4261df166110

diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index da0a8f4896..73e041a6f3 100644
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -1,17 +1,23 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 # $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
-PKG_VERSION:=0.1
-PKG_RELEASE:=2
-PKG_MD5SUM:=4ba2a49c593d0c1088cc5791b8c6a985
+PKG_VERSION:=1.0-RC1
+PKG_RELEASE:=1
+PKG_MD5SUM:=ab752eebbebcfa84178de0a4632d7688
 
-PKG_SOURCE_URL:=http://ftp.berlios.de/pub/xwrt/storage/
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://miniupnp.tuxfamily.org/files
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -27,20 +33,21 @@ define Package/miniupnpd
 endef
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) -f Makefile.openwrt
-endef
-
-define Build/Clean
-	# remove the client dir since the build system doesnt know about it
-	rm -rf $(PKG_BUILD_DIR)/../miniupnpc
+	$(MAKE) \
+		-C $(PKG_BUILD_DIR) \
+		-f Makefile.linux \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) -I $(STAGING_DIR)/usr/include" \
+		LIBS="$(STAGING_DIR)/usr/lib/libiptc.a"
 endef
 
 define Package/miniupnpd/install
-	$(INSTALL_DIR) $(1)/usr/bin $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/usr/bin $(1)/etc/init.d $(1)/etc/config $(1)/etc/hotplug.d/iface
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/miniupnpd $(1)/usr/bin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/linux/*.sh $(1)/usr/bin/
 	$(INSTALL_BIN) ./files/miniupnpd.init $(1)/etc/init.d/miniupnpd
-	$(STRIP) $(1)/usr/bin/miniupnpd
+	$(INSTALL_DATA) ./files/upnpd.config $(1)/etc/config/upnpd
+	$(INSTALL_DATA) ./files/miniupnpd.hotplug $(1)/etc/hotplug.d/iface/10-miniupnpd
 endef
 
 $(eval $(call BuildPackage,miniupnpd))