diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-08-24 23:23:15 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-08-24 23:23:15 +0200 |
| commit | eb3ec56d639e41f7927c18a5e23133b3fa8fe1fd (patch) | |
| tree | afbcb57704173bfd1899b8ab7bd4bf1f92c3d3d6 /mk | |
| parent | 4b8458fa064fb0774aca796eff6329b089b91df7 (diff) | |
| download | embtoolkit-eb3ec56d639e41f7927c18a5e23133b3fa8fe1fd.tar.gz embtoolkit-eb3ec56d639e41f7927c18a5e23133b3fa8fe1fd.tar.bz2 embtoolkit-eb3ec56d639e41f7927c18a5e23133b3fa8fe1fd.tar.xz | |
Build system: generic macros: move __embtk_patch_site to __embtk_pkg_patch_site
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/macros.mk | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/mk/macros.mk b/mk/macros.mk index 1da10d1..8911012 100644 --- a/mk/macros.mk +++ b/mk/macros.mk @@ -24,11 +24,11 @@ ################################################################################ # Embtoolkit colors -__embtk_color_red = "\E[1;31m" -__embtk_color_green = "\E[1;32m" -__embtk_color_yellow = "\E[1;33m" -__embtk_color_blue = "\E[1;34m" -__embtk_no_color = "\E[0m" +__embtk_color_red = "\E[1;31m" +__embtk_color_green = "\E[1;32m" +__embtk_color_yellow = "\E[1;33m" +__embtk_color_blue = "\E[1;34m" +__embtk_no_color = "\E[0m" # echo colored text #usage $(call embtk_echo_red,$(TEXT)) @@ -221,7 +221,7 @@ PKGV = $(strip $(shell echo $(1) | tr a-z A-Z)) __embtk_pkg_name = $(strip $($(PKGV)_NAME)) __embtk_pkg_version = $(strip $($(PKGV)_VERSION)) __embtk_pkg_site = $(strip $($(PKGV)_SITE)) -__embtk_patch_site = $(strip $($(PKGV)_PATCH_SITE)) +__embtk_pkg_patch_site = $(strip $($(PKGV)_PATCH_SITE)) __embtk_pkg_mirror1 = $(strip $($(PKGV)_MIRROR1)) __embtk_pkg_mirror2 = $(strip $($(PKGV)_MIRROR2)) __embtk_pkg_mirror3 = $(strip $($(PKGV)_MIRROR3)) @@ -374,7 +374,8 @@ define embtk_configure_hostpkg $(__embtk_pkg_configureenv) \ $(CONFIG_SHELL) $(__embtk_pkg_srcdir)/configure \ --build=$(HOST_BUILD) --host=$(HOST_ARCH) \ - --prefix=$(if $(__embtk_pkg_prefix),$(__embtk_pkg_prefix),$(HOSTTOOLS)/usr) \ + --prefix=$(strip $(if $(__embtk_pkg_prefix), \ + $(__embtk_pkg_prefix),$(HOSTTOOLS)/usr)) \ $(__embtk_pkg_configureopts) $(Q)touch $(__embtk_pkg_builddir)/.configured endef @@ -498,7 +499,7 @@ if [ "x$(CONFIG_EMBTK_$(PKGV)_NEED_PATCH)" == "xy" ]; then \ $(DOWNLOAD_DIR)/$(__embtk_pkg_name)-$(__embtk_pkg_version).patch || \ $(call embtk_wget, \ $(__embtk_pkg_name)-$(__embtk_pkg_version).patch, \ - $(__embtk_patch_site), \ + $(__embtk_pkg_patch_site), \ $(__embtk_pkg_name)-$(__embtk_pkg_version)-*.patch); \ fi endef |