From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 24 Mar 2007 17:45:19 +0000 (+0000)
Subject: fix miniupnpd compile
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=b271fd5d2cb6e1a70e35526d035ae529f1f9f345

fix miniupnpd compile

SVN-Revision: 6674
---

diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index 644a1df5f1..65d879c50f 100644
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -34,6 +34,7 @@ define Build/Compile
 	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
diff --git a/net/miniupnpd/patches/001-makefile-tweaks.patch b/net/miniupnpd/patches/001-makefile-tweaks.patch
index 39f3aca178..db039e0faa 100644
--- a/net/miniupnpd/patches/001-makefile-tweaks.patch
+++ b/net/miniupnpd/patches/001-makefile-tweaks.patch
@@ -1,6 +1,15 @@
---- miniupnpd-1.0-RC3/Makefile.openwrt.orig	2007-02-06 22:50:56.000000000 -0600
-+++ miniupnpd-1.0-RC3/Makefile.openwrt	2007-02-06 22:51:00.000000000 -0600
-@@ -11,17 +11,15 @@
+diff -ur miniupnpd.old/Makefile.openwrt miniupnpd.dev/Makefile.openwrt
+--- miniupnpd.old/Makefile.openwrt	2007-03-24 18:44:00.062407944 +0100
++++ miniupnpd.dev/Makefile.openwrt	2007-03-24 18:43:43.659901504 +0100
+@@ -2,7 +2,6 @@
+ # http://miniupnp.free.fr/
+ # Author : Thomas Bernard
+ # for use with GNU Make
+-include $(TOPDIR)/rules.mk
+ #CFLAGS = -Wall -O -D_GNU_SOURCE -g
+ #CFLAGS = -Wall -Os -D_GNU_SOURCE
+ #CC = mipsel-linux-gcc
+@@ -11,17 +10,15 @@
  CFLAGS += -D_GNU_SOURCE
  RM = rm -f
  INSTALL = install
@@ -20,7 +29,7 @@
  TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
  
  EXECUTABLES = miniupnpd testupnpdescgen
-@@ -38,6 +36,7 @@
+@@ -38,6 +35,7 @@
  	@echo no install for now...
  
  miniupnpd:	$(BASEOBJS) $(LNXOBJS) $(LIBS)
@@ -28,7 +37,7 @@
  
  testupnpdescgen:	$(TESTUPNPDESCGENOBJS)
  
-@@ -69,3 +68,4 @@
+@@ -69,3 +67,4 @@
  linux/iptcrdr.o: linux/iptcrdr.h
  testupnpdescgen.o: upnpdescgen.h
  upnpdescgen.o: upnpdescgen.h miniupnpdpath.h upnpglobalvars.h