diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-04-03 02:10:32 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-04-03 02:10:32 +0000 |
| commit | 8a0d981006508cbaa3f39a75affd63bdb0f0ff3f (patch) | |
| tree | 6e0ff5428a36ed0b862d5c1c93761f0f254a0d3f | |
| parent | f6a0d67e7ce9e9b95d8576c8f494418a75de7f1c (diff) | |
| download | upstream-8a0d981006508cbaa3f39a75affd63bdb0f0ff3f.tar.gz upstream-8a0d981006508cbaa3f39a75affd63bdb0f0ff3f.tar.bz2 upstream-8a0d981006508cbaa3f39a75affd63bdb0f0ff3f.zip | |
build: move the SH_FUNC eval to the beginning of the opkg control file build command chain, not in front of every single command
SVN-Revision: 26432
| -rw-r--r-- | include/package-ipkg.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 9cccff261a..33b9ef8353 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -30,7 +30,7 @@ IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg define BuildIPKGVariable ifdef Package/$(1)/$(2) $(call shexport,Package/$(1)/$(2)) - $(1)_COMMANDS += $(SH_FUNC) var2file "$(call shvar,Package/$(1)/$(2))" $(2); + $(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2); endif endef @@ -113,7 +113,7 @@ ifeq ($(DUMP),) echo -n "Description: "; $(SH_FUNC) getvar $(call shvar,Package/$(1)/description) | sed -e 's,^[[:space:]]*, ,g'; \ ) > $$(IDIR_$(1))/CONTROL/control chmod 644 $$(IDIR_$(1))/CONTROL/control - (cd $$(IDIR_$(1))/CONTROL; \ + $(SH_FUNC) (cd $$(IDIR_$(1))/CONTROL; \ $($(1)_COMMANDS) \ ) |