From 748cabc8d44cb8d3cd0e11e9f7d5aafc18bd2faa Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 3 Apr 2011 02:10:32 +0000 Subject: [PATCH] build: move the SH_FUNC eval to the beginning of the opkg control file build command chain, not in front of every single command git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26432 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package-ipkg.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 9cccff261..33b9ef835 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) \ ) -- 2.20.1