summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-03-13 16:16:54 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-03-13 16:16:54 +0000
commit26a4d6751bd3394c31ee21c0148fc6b9cca65576 (patch)
tree673d65c6ca8fcaf384bf8bb13e2a3c3aea5818d3 /include
parent3f577f4c40ad8db410405ba37782f51c853fe65d (diff)
fix the target-local CONFIG_SITE export. apparently make can't do more than one of them in a single line
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14863 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
-rw-r--r--include/package.mk10
1 files changed, 6 insertions, 4 deletions
diff --git a/include/package.mk b/include/package.mk
index 489ed9b52..7e0501c55 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)