diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-03-10 21:34:44 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-03-10 21:34:44 +0100 |
| commit | 76673dc209ba57824cc61e1d553abbb2260717ae (patch) | |
| tree | c4fada597fe0484aa59ea4d66c36b428c01313f3 /mk | |
| parent | fc14ed96e59e0548a350d99cb46d9eb3c6ff6ff5 (diff) | |
| download | embtoolkit-76673dc209ba57824cc61e1d553abbb2260717ae.tar.gz embtoolkit-76673dc209ba57824cc61e1d553abbb2260717ae.tar.bz2 embtoolkit-76673dc209ba57824cc61e1d553abbb2260717ae.tar.xz | |
build system: generic macros: use __embtk_mk_unquotestr internal macro
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/macros.packages.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk index 6ec6ee0..b2a9ab5 100644 --- a/mk/macros.packages.mk +++ b/mk/macros.packages.mk @@ -117,19 +117,19 @@ __embtk_pkg_mirror2 = $(strip $($(PKGV)_MIRROR2)) __embtk_pkg_mirror3 = $(strip $($(PKGV)_MIRROR3)) __embtk_pkg_package = $(strip $($(PKGV)_PACKAGE)) -__embtk_pkg_refspec = $(subst ",,$(strip $(CONFIG_EMBTK_$(PKGV)_REFSPEC))) +__embtk_pkg_refspec = $(call __embtk_mk_unquotestr,$(CONFIG_EMBTK_$(PKGV)_REFSPEC)) __embtk_pkg_usesvn = $(if $(CONFIG_EMBTK_$(PKGV)_VERSION_SVN),svn) __embtk_pkg_svnsite = $(strip $($(PKGV)_SVN_SITE)) -__embtk_pkg_svnbranch = $(subst ",,$(strip $(CONFIG_EMBTK_$(PKGV)_SVN_BRANCH))) -__embtk_pkg_svnrev = $(subst ",,$(strip $(CONFIG_EMBTK_$(PKGV)_SVN_REVISION))) +__embtk_pkg_svnbranch = $(call __embtk_mk_unquotestr,$(CONFIG_EMBTK_$(PKGV)_SVN_BRANCH)) +__embtk_pkg_svnrev = $(call __embtk_mk_unquotestr,$(CONFIG_EMBTK_$(PKGV)_SVN_REVISION)) __embtk_pkg_localsvn = $(strip $(if $(__embtk_pkg_usesvn), \ $(EMBTK_ROOT)/src/$(__embtk_pkg_refspec)/$(__embtk_pkg_name)-$(notdir $(__embtk_pkg_svnbranch)).svn)) __embtk_pkg_usegit = $(if $(CONFIG_EMBTK_$(PKGV)_VERSION_GIT),git) __embtk_pkg_gitsite = $(strip $($(PKGV)_GIT_SITE)) -__embtk_pkg_gitbranch = $(or $(subst ",,$(strip $(CONFIG_EMBTK_$(PKGV)_GIT_BRANCH))),master) -__embtk_pkg_gitrev = $(or $(subst ",,$(strip $(CONFIG_EMBTK_$(PKGV)_GIT_REVISION))),HEAD) +__embtk_pkg_gitbranch = $(or $(call __embtk_mk_unquotestr,$(CONFIG_EMBTK_$(PKGV)_GIT_BRANCH)),master) +__embtk_pkg_gitrev = $(or $(call __embtk_mk_unquotestr,$(CONFIG_EMBTK_$(PKGV)_GIT_REVISION)),HEAD) __embtk_pkg_localgit = $(strip $(if $(__embtk_pkg_usegit), \ $(EMBTK_ROOT)/src/$(__embtk_pkg_refspec)/$(__embtk_pkg_name).git)) @@ -194,7 +194,7 @@ __embtk_hosttools_nrpkgs-n = $(if $(__embtk_hosttools_pkgs-n), \ # A macro to get packages version from .config file. # usage: $(call embtk_get_pkgversion,PACKAGE) # -embtk_get_pkgversion = $(subst ",,$(strip $(CONFIG_EMBTK_$(PKGV)_VERSION_STRING))) +embtk_get_pkgversion = $(call __embtk_mk_unquotestr,$(CONFIG_EMBTK_$(PKGV)_VERSION_STRING)) # |