aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-03-13 16:16:54 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-03-13 16:16:54 +0000
commite4a5d86b54b9226cb77edba9eeac3c2834fc0721 (patch)
tree4fe39c31653c2a9b1de155880cf61845b132896c
parentec6b3bf2bef97206aedec6a7dd253d77f3ee6882 (diff)
downloadupstream-e4a5d86b54b9226cb77edba9eeac3c2834fc0721.tar.gz
upstream-e4a5d86b54b9226cb77edba9eeac3c2834fc0721.tar.bz2
upstream-e4a5d86b54b9226cb77edba9eeac3c2834fc0721.zip
fix the target-local CONFIG_SITE export. apparently make can't do more than one of them in a single line
SVN-Revision: 14863
-rw-r--r--include/package.mk10
1 files changed, 6 insertions, 4 deletions
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)