fix natpmp breakage introduced in r12937 and make sure that the target cflags actuall...

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

diff --git a/net/natpmp/Makefile b/net/natpmp/Makefile
index 86bff45365fb70a521f7a184bdea380ae67f1f8d..f4091dc18673bc4938abc8784fe62221b5abbdb8 100644 (file)
--- a/net/natpmp/Makefile
+++ b/net/natpmp/Makefile
@@ -1,16 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=natpmp
-PKG_VERSION:=0.2.1
-PKG_RELEASE:=1
+PKG_VERSION:=0.2.3
+PKG_RELEASE:=2
 
 PKG_SOURCE_URL:=http://download.savannah.nongnu.org/releases/natpmp/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=b0b1fea34ecd2c99f75c01a6728c9a7b
-
-PKG_CAT:=zcat
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=f696565d59c488b9ad9f43625be93377
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -23,7 +19,8 @@ define Package/natpmp
 endef
 
 define Package/natpmp/description
-  stunnel replacement based on xyssl
+       This is a daemon implementing NAT-PMP. NAT-PMP is a protocol for
+       handling port forwarding requests from clients behind a NAT.
 endef
 
 define Build/Configure
@@ -35,19 +32,15 @@ define Build/Compile
                $(TARGET_CONFIGURE_OPTS) \
                CC="$(TARGET_CC)" \
                LD="$(TARGET_CC)" \
-               CCFLAGS="$(strip $(TARGET_CFLAGS))" \
-               CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include" \
+               CFLAGS="$(strip $(TARGET_CFLAGS))" \
+               CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include -DIPTABLES_PATH=\\\"/usr/sbin\\\"" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
                prefix="$(PKG_INSTALL_DIR)/usr"
-       mkdir -p $(PKG_INSTALL_DIR)/usr/sbin
-       $(CP) $(PKG_BUILD_DIR)/natpmp $(PKG_INSTALL_DIR)/usr/sbin
 endef
 
 define Package/natpmp/install
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/natpmp $(1)/usr/sbin
-       $(RSTRIP) $(1)/usr/sbin/natpmp
-
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/natpmp $(1)/usr/sbin
        $(INSTALL_DIR) $(1)/etc/config
        $(INSTALL_DATA) ./files/natpmp.config $(1)/etc/config/natpmp
        $(INSTALL_DIR) $(1)/etc/init.d