projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8df6a82
)
build: move the SH_FUNC eval to the beginning of the opkg control file build command...
author
Felix Fietkau
<nbd@openwrt.org>
Sun, 3 Apr 2011 02:10:32 +0000
(
02:10
+0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Sun, 3 Apr 2011 02:10:32 +0000
(
02:10
+0000)
SVN-Revision: 26432
include/package-ipkg.mk
patch
|
blob
|
history
diff --git
a/include/package-ipkg.mk
b/include/package-ipkg.mk
index 9cccff261a8aa597778e8e4ddb300cf434f965d6..33b9ef83537f98c0bf221df81932169e4cfbe2bc 100644
(file)
--- 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))
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
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
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) \
)
$($(1)_COMMANDS) \
)