summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2011-09-01 23:35:11 +0200
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2011-09-01 23:35:11 +0200
commit40cdb8e56e096a35ee5d8e462ffb5d080260afb4 (patch)
tree36d712eebcdce54e9303fd79bb0f940705d4cf0b
parentf543705fdf63f85dcc5576ec0a6a38d1682a83ef (diff)
downloadembtoolkit-40cdb8e56e096a35ee5d8e462ffb5d080260afb4.tar.gz
embtoolkit-40cdb8e56e096a35ee5d8e462ffb5d080260afb4.tar.bz2
embtoolkit-40cdb8e56e096a35ee5d8e462ffb5d080260afb4.tar.xz
Build system: generic macros: embtk_beforeinstall_{pkgname}: needs to be called after package decompression
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
-rw-r--r--mk/macros.mk10
1 files changed, 2 insertions, 8 deletions
diff --git a/mk/macros.mk b/mk/macros.mk
index 3bfa238..4886dd2 100644
--- a/mk/macros.mk
+++ b/mk/macros.mk
@@ -428,6 +428,7 @@ define __embtk_install_pkg_make
$(Q)$(if $(strip $(__embtk_pkg_deps)),$(MAKE) $(__embtk_pkg_deps))
$(Q)$(call embtk_download_pkg,$(1))
$(Q)$(call embtk_decompress_pkg,$(1))
+ $(Q)$(if $(embtk_beforeinstall_$(pkgv)),$(embtk_beforeinstall_$(pkgv)))
$(Q)$(if $(__embtk_autotoolspkg-y),$(call embtk_configure_pkg,$(1)))
$(Q)$(if $(__embtk_pkg_makedirs), \
$(__embtk_multi_make), \
@@ -444,6 +445,7 @@ define __embtk_install_hostpkg_make
$(Q)$(if $(strip $(__embtk_pkg_deps)),$(MAKE) $(__embtk_pkg_deps))
$(Q)$(call embtk_download_pkg,$(1))
$(Q)$(call embtk_decompress_pkg,$(1))
+ $(if $(embtk_beforeinstall_$(pkgv)),$(embtk_beforeinstall_$(pkgv)))
$(Q)$(if $(__embtk_autotoolspkg-y),$(call embtk_configure_hostpkg,$(1)))
$(Q)$(if $(__embtk_pkg_makedirs), \
$(__embtk_multi_make), \
@@ -462,8 +464,6 @@ endef
#
define embtk_install_pkg
$(if $(__embtk_pkg_installed-y),true,
- $(if $(embtk_beforeinstall_$(pkgv)),
- $(embtk_beforeinstall_$(pkgv)))
$(call __embtk_install_pkg_make,$(1),autotools))
$(if $(embtk_postinstall_$(pkgv)),$(embtk_postinstall_$(pkgv)))
endef
@@ -476,8 +476,6 @@ endef
#
define embtk_makeinstall_pkg
$(if $(__embtk_pkg_installed-y),true,
- $(if $(embtk_beforeinstall_$(pkgv)),
- $(embtk_beforeinstall_$(pkgv)))
$(call __embtk_install_pkg_make,$(1)))
$(if $(embtk_postinstall_$(pkgv)),$(embtk_postinstall_$(pkgv)))
endef
@@ -490,8 +488,6 @@ endef
#
define embtk_install_hostpkg
$(if $(__embtk_pkg_installed-y),true,
- $(if $(embtk_beforeinstall_$(pkgv)),
- $(embtk_beforeinstall_$(pkgv)))
$(call __embtk_install_hostpkg_make,$(1),autotools))
$(if $(embtk_postinstall_$(pkgv)),$(embtk_postinstall_$(pkgv)))
endef
@@ -504,8 +500,6 @@ endef
#
define embtk_makeinstall_hostpkg
$(if $(__embtk_pkg_installed-y),true,
- $(if $(embtk_beforeinstall_$(pkgv)),
- $(embtk_beforeinstall_$(pkgv)))
$(call __embtk_install_hostpkg_make,$(1)))
$(if $(embtk_postinstall_$(pkgv)),$(embtk_postinstall_$(pkgv)))
endef