diff options
Diffstat (limited to 'mk/macros.mk')
| -rw-r--r-- | mk/macros.mk | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/mk/macros.mk b/mk/macros.mk index 28688f3..0edccdf 100644 --- a/mk/macros.mk +++ b/mk/macros.mk @@ -297,6 +297,14 @@ __EMBTK_MULTI_MAKE_INSTALL = $(foreach builddir,$($(1)_MAKE_DIRS), \ __EMBTK_SINGLE_MAKE_INSTALL = $(MAKE) -C $($(1)_BUILD_DIR) \ DESTDIR=$(SYSROOT)/$($(1)_SYSROOT_SUFFIX) $($(1)_MAKE_OPTS) install +__EMBTK_MULTI_MAKE_HOSTINSTALL = $(foreach builddir,$($(1)_MAKE_DIRS), \ + $(MAKE) -C $($(1)_BUILD_DIR)/$(builddir) \ + $(if $($(1)_DESTDIR),DESTDIR=$($(1)_DESTDIR)) \ + $($(1)_MAKE_OPTS) install;) + +__EMBTK_SINGLE_MAKE_HOSTINSTALL = $(MAKE) -C $($(1)_BUILD_DIR) \ + $(if $($(1)_DESTDIR),DESTDIR=$($(1)_DESTDIR)) $($(1)_MAKE_OPTS) install + define __EMBTK_INSTALL_PKG_MAKE $(call EMBTK_GENERIC_MSG,"Compiling and installing $($(1)_NAME)-$($(1)_VERSION) in your root filesystem...") $(Q)$(if $(strip $($(1)_DEPS)),$(MAKE) $($(1)_DEPS)) @@ -330,9 +338,12 @@ define __EMBTK_INSTALL_HOSTPKG_MAKE $(Q)$(call EMBTK_DOWNLOAD_PKG,$(1)) $(Q)$(call EMBTK_DECOMPRESS_HOSTPKG,$(1)) $(Q)$(call EMBTK_CONFIGURE_HOSTPKG,$(1)) - $(Q)$(MAKE) -C $($(1)_BUILD_DIR) $($(1)_MAKE_OPTS) $(J) - $(Q)$(MAKE) -C $($(1)_BUILD_DIR) $($(1)_MAKE_OPTS) \ - $(if $($(1)_DESTDIR),DESTDIR=$($(1)_DESTDIR)) install + $(Q)$(if $($(1)_MAKE_DIRS), \ + $(__EMBTK_MULTI_MAKE), \ + $(__EMBTK_SINGLE_MAKE)) + $(Q)$(if $($(1)_MAKE_DIRS), \ + $(__EMBTK_MULTI_MAKE_HOSTINSTALL), \ + $(__EMBTK_SINGLE_MAKE_HOSTINSTALL)) @touch $($(1)_BUILD_DIR)/.installed endef define EMBTK_INSTALL_HOSTPKG |