fix miniupnpd compile

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

diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index 2ce3002be5ea84d851652aef634866e1b8a7504e..65d879c50f88fd8cee69f120d1431c630d78af55 100644 (file)
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -9,9 +9,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
-PKG_VERSION:=1.0-RC1
+PKG_VERSION:=1.0-RC3
 PKG_RELEASE:=1
-PKG_MD5SUM:=ab752eebbebcfa84178de0a4632d7688
+PKG_MD5SUM:=4aa5e9d6281bbec5b8dd0b386f35a153
 
 PKG_SOURCE_URL:=http://miniupnp.tuxfamily.org/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -27,20 +27,14 @@ define Package/miniupnpd
   CATEGORY:=Network
   DEPENDS:=+iptables
   TITLE:=Lightweight UPnP daemon
-  DESCRIPTION:=\
-       Lightweight UPnP daemon
   URL:=http://miniupnp.tuxfamily.org/
 endef
 
-define Package/miniupnpd/postinst
-/etc/init.d/miniupnpd enable
-endef
-
 define Build/Compile
-       $(MAKE) \
-               -C $(PKG_BUILD_DIR) \
-               -f Makefile.linux \
+       ln -sf $(PKG_BUILD_DIR)/config.h.openwrt $(PKG_BUILD_DIR)/config.h
+       $(MAKE) -C $(PKG_BUILD_DIR) -f Makefile.openwrt \
                $(TARGET_CONFIGURE_OPTS) \
+               STAGING_DIR="$(STAGING_DIR)" \
                CFLAGS="$(TARGET_CFLAGS) -I $(STAGING_DIR)/usr/include" \
                LIBS="$(STAGING_DIR)/usr/lib/libiptc.a"
 endef
@@ -50,7 +44,7 @@ define Package/miniupnpd/install
        $(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
-       $(INSTALL_BIN) ./files/upnpd.config $(1)/etc/config/upnpd
+       $(INSTALL_DATA) ./files/upnpd.config $(1)/etc/config/upnpd
        $(INSTALL_DATA) ./files/miniupnpd.hotplug $(1)/etc/hotplug.d/iface/10-miniupnpd
 endef