diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-01-28 06:32:28 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-01-28 06:32:28 +0000 |
| commit | 45616607b43f3bcc46701fb9070d954844ebc6e2 (patch) | |
| tree | bde47abf71bedf462cfa96bbdb6e2b77d52b70dd /package | |
| parent | 0441f3c64b587e1ffe5d8246a6c97a556b61bfa9 (diff) | |
Makefile.autotools.in: add FOO_MAKE for packages needing to use $(MAKE1)
As requested on irc.
Diffstat (limited to 'package')
| -rw-r--r-- | package/Makefile.autotools.in | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in index eacdec95b..b8abd73f3 100644 --- a/package/Makefile.autotools.in +++ b/package/Makefile.autotools.in @@ -38,6 +38,8 @@ # environment passed to the <configure> script # FOO_CONF_OPT [default empty] # arguments passed to the <configure> script +# FOO_MAKE [default $(MAKE)] +# command to use to execute <make> # FOO_MAKE_ENV [default empty] # environment passed to all calls to <make> in the package source # directory @@ -257,13 +259,13 @@ $(BUILD_DIR)/%/.stamp_configured: # Build $(BUILD_DIR)/%/.stamp_built: $(call MESSAGE,"Building") - $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPT) -C $(@D)/$($(PKG)_SUBDIR) + $($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_MAKE_OPT) -C $(@D)/$($(PKG)_SUBDIR) $(Q)touch $@ # Install to staging dir $(BUILD_DIR)/%/.stamp_staging_installed: $(call MESSAGE,'Installing to host (staging directory)') - $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_INSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR) + $($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_INSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR) # toolchain/replace.sh $(STAGING_DIR)/usr/lib ".*\.la" "\(['= ]\)/usr" "\\1$(STAGING_DIR)/usr" for i in $$(find $(STAGING_DIR)/usr/lib/ -name "*.la"); do \ cp $$i $$i~; \ @@ -274,7 +276,7 @@ $(BUILD_DIR)/%/.stamp_staging_installed: # Install to target dir $(PROJECT_BUILD_DIR)/autotools-stamps/%_target_installed: $(call MESSAGE,"Installing to target") - $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_INSTALL_TARGET_OPT) -C $($(PKG)_DIR)/$($(PKG)_SUBDIR) + $($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_INSTALL_TARGET_OPT) -C $($(PKG)_DIR)/$($(PKG)_SUBDIR) $(if $(BR2_HAVE_MANPAGES),,for d in man share/man; do \ rm -rf $(TARGET_DIR)/$$d $(TARGET_DIR)/usr/$$d; \ done) @@ -288,14 +290,14 @@ $(PROJECT_BUILD_DIR)/autotools-stamps/%_target_installed: $(BUILD_DIR)/%/.stamp_cleaned: $(call MESSAGE,"Cleaning up") - -$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_CLEAN_OPT) -C $(@D)/$($(PKG)_SUBDIR) + -$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_CLEAN_OPT) -C $(@D)/$($(PKG)_SUBDIR) rm -f $(@D)/.stamp_built $(BUILD_DIR)/%/.stamp_uninstalled: $(call MESSAGE,"Uninstalling") - $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_UNINSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR) + $($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_UNINSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR) rm -f $(@D)/.stamp_staging_installed - $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_UNINSTALL_TARGET_OPT) -C $(@D)/$($(PKG)_SUBDIR) + $($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_UNINSTALL_TARGET_OPT) -C $(@D)/$($(PKG)_SUBDIR) rm -f $($(PKG)_TARGET_INSTALL_TARGET) $($(PKG)_HOOK_POST_INSTALL) $(BUILD_DIR)/%/.stamp_dircleaned: @@ -331,6 +333,7 @@ $(2)_LIBTOOL_PATCH ?= YES $(2)_USE_CONFIG_CACHE ?= $(if $(BR2_CONFIG_CACHE),YES,NO) $(2)_CONF_ENV ?= $(2)_CONF_OPT ?= +$(2)_MAKE ?= $(MAKE) $(2)_MAKE_ENV ?= $(2)_MAKE_OPT ?= $(2)_INSTALL_STAGING ?= NO |