Commit 43695a98 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

autotools: add escaping when using HOST_MAKE_ENV and TARGET_MAKE_ENV 



Without this escaping, the evaluation of HOST_MAKE_ENV and
TARGET_MAKE_ENV is done when the AUTOTARGETS_INNER macro is defined,
not when it is instantiated by the various packages. The result is
that the $(PKG_CONFIG_HOST_BINARY) variable, used in $(HOST_MAKE_ENV)
gets expanded before it is defined.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent b12dfaf1

package/Makefile.autotools.in

+8 −8
Original line number Diff line number Diff line
@@ -212,11 +212,11 @@ endif 
ifndef $(2)_BUILD_CMDS

ifeq ($(5),target)

define $(2)_BUILD_CMDS

	$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_SRCDIR)

	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_SRCDIR)

endef

else

define $(2)_BUILD_CMDS

	$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_SRCDIR)

	$$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_SRCDIR)

endef

endif

endif
@@ -227,7 +227,7 @@ endif 
#

ifndef $(2)_INSTALL_CMDS

define $(2)_INSTALL_CMDS

	$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) -C $$($$(PKG)_SRCDIR) install

	$$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) -C $$($$(PKG)_SRCDIR) install

endef

endif
@@ -237,7 +237,7 @@ endif 
#

ifndef $(2)_INSTALL_STAGING_CMDS

define $(2)_INSTALL_STAGING_CMDS

	$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_SRCDIR)

	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_SRCDIR)

	for i in $$$$(find $(STAGING_DIR)/usr/lib* -name "*.la"); do \

		cp -f $$$$i $$$$i~; \

		$$(SED) "s:\(['= ]\)/usr:\\1$(STAGING_DIR)/usr:g" $$$$i; \
@@ -251,7 +251,7 @@ endif 
#

ifndef $(2)_INSTALL_TARGET_CMDS

define $(2)_INSTALL_TARGET_CMDS

	$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_TARGET_OPT) -C $$($$(PKG)_SRCDIR)

	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_TARGET_OPT) -C $$($$(PKG)_SRCDIR)

endef

endif
@@ -261,7 +261,7 @@ endif 
#

ifndef $(2)_CLEAN_CMDS

define $(2)_CLEAN_CMDS

	-$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE)  $$($$(PKG)_CLEAN_OPT) -C $$($$(PKG)_SRCDIR)

	-$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE)  $$($$(PKG)_CLEAN_OPT) -C $$($$(PKG)_SRCDIR)

endef

endif
@@ -271,7 +271,7 @@ endif 
#

ifndef $(2)_UNINSTALL_STAGING_CMDS

define $(2)_UNINSTALL_STAGING_CMDS

	$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_UNINSTALL_STAGING_OPT) -C $$($$(PKG)_SRCDIR)

	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_UNINSTALL_STAGING_OPT) -C $$($$(PKG)_SRCDIR)

endef

endif
@@ -281,7 +281,7 @@ endif 
#

ifndef $(2)_UNINSTALL_TARGET_CMDS

define $(2)_UNINSTALL_TARGET_CMDS

	$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_UNINSTALL_TARGET_OPT) -C $$($$(PKG)_SRCDIR)

	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_UNINSTALL_TARGET_OPT) -C $$($$(PKG)_SRCDIR)

endef

endif