From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 13 Mar 2009 16:16:54 +0000 (+0000)
Subject: fix the target-local CONFIG_SITE export. apparently make can't do more than one of... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e4a5d86b54b9226cb77edba9eeac3c2834fc0721;p=openwrt%2Fstaging%2Frobimarko.git

fix the target-local CONFIG_SITE export. apparently make can't do more than one of them in a single line

SVN-Revision: 14863
---

diff --git a/include/package.mk b/include/package.mk
index 489ed9b527..7e0501c554 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -68,7 +68,7 @@ define Build/DefaultTargets
   $(if $(strip $(PKG_SOURCE_URL)),$(call Download,default))
   $(call Build/Autoclean)
 
-  $(STAMP_PREPARED) : export PATH=$$(TARGET_PATH_PKG) CONFIG_SITE=$$(CONFIG_SITE)
+  $(STAMP_PREPARED) : export PATH=$$(TARGET_PATH_PKG)
   $(STAMP_PREPARED):
 	@-rm -rf $(PKG_BUILD_DIR)
 	@mkdir -p $(PKG_BUILD_DIR)
@@ -77,14 +77,16 @@ define Build/DefaultTargets
 	$(foreach hook,$(Hooks/Prepare/Post),$(call $(hook))$(sep))
 	touch $$@
 
-  $(STAMP_CONFIGURED) : export PATH=$$(TARGET_PATH_PKG) CONFIG_SITE=$$(CONFIG_SITE)
+  $(STAMP_CONFIGURED) : export PATH=$$(TARGET_PATH_PKG)
+  $(STAMP_CONFIGURED) : export CONFIG_SITE:=$$(CONFIG_SITE)
   $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(HOST_STAMP_INSTALLED)
 	$(foreach hook,$(Hooks/Configure/Pre),$(call $(hook))$(sep))
 	$(Build/Configure)
 	$(foreach hook,$(Hooks/Configure/Post),$(call $(hook))$(sep))
 	touch $$@
 
-  $(STAMP_BUILT) : export PATH=$$(TARGET_PATH_PKG) CONFIG_SITE=$$(CONFIG_SITE)
+  $(STAMP_BUILT) : export PATH=$$(TARGET_PATH_PKG)
+  $(STAMP_BUILT) : export CONFIG_SITE:=$$(CONFIG_SITE)
   $(STAMP_BUILT): $(STAMP_CONFIGURED)
 	$(foreach hook,$(Hooks/Compile/Pre),$(call $(hook))$(sep))
 	$(Build/Compile)
@@ -93,7 +95,7 @@ define Build/DefaultTargets
 	$(foreach hook,$(Hooks/Install/Post),$(call $(hook))$(sep))
 	touch $$@
 
-  $(STAMP_INSTALLED) : export PATH=$$(TARGET_PATH_PKG) CONFIG_SITE=$$(CONFIG_SITE)
+  $(STAMP_INSTALLED) : export PATH=$$(TARGET_PATH_PKG)
   $(STAMP_INSTALLED): $(STAMP_BUILT)
 	$(SUBMAKE) -j1 clean-staging
 	rm -rf $(TMP_DIR)/stage-$(PKG_NAME)