From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 29 Jun 2012 18:30:10 +0000 (+0000)
Subject: lsof: use environment variables correctly to prime Configure
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=4f152d80d101f5f49377ed6f16f4ec4c8fc870bf;p=packages.git

lsof: use environment variables correctly to prime Configure

Rewrite of the configure and compile stages as per the suggestions in the packages 00XCONFIG instructions.

Note that this is required to get eglibc working, as eglibc doesn't include the RPC functions as part of libc.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@32529 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/utils/lsof/Makefile b/utils/lsof/Makefile
index dd070b05d..bcf6b8045 100644
--- a/utils/lsof/Makefile
+++ b/utils/lsof/Makefile
@@ -20,7 +20,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)+dfsg.orig
 
 include $(INCLUDE_DIR)/package.mk
 
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
 TARGET_LDFLAGS += $(LIBRPC)
 
 define Package/lsof
@@ -35,17 +34,17 @@ define Build/Configure
 	cd $(PKG_BUILD_DIR); \
 		LINUX_CLIB="-DGLIBCV=2" \
 		LSOF_CC="$(TARGET_CC)" \
+		LSOF_INCLUDE="-I$(STAGING_DIR)/usr/include" \
 		LSOF_VSTR="$(LINUX_VERSION)" \
+		LSOF_CFGC="$(TARGET_CFLAGS)" \
+		LSOF_CFGL="$(TARGET_LDFLAGS)" \
+		LSOF_AR="$(TARGET_CROSS)ar cr" \
+		LSOF_RANLIB="$(TARGET_CROSS)ranlib" \
 		./Configure -n linux
 endef
 
 define Build/Compile	
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" \
-		AR="$(TARGET_CROSS)ar cr" \
-		RANLIB="$(TARGET_CROSS)ranlib" \
-		DEBUG="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" 
+	$(MAKE) -C $(PKG_BUILD_DIR)
 endef
 
 define Package/lsof/install