summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-11-11 00:42:22 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-11-11 00:42:22 +0100
commita02f7db538757921c9af0ff710adb45b84607e11 (patch)
tree7195ac64a9574c0ada898beeaa4c4a51d3639891 /mk
parentb688b52979ed7888ae8cce36b84033161e59a67b (diff)
downloadembtoolkit-a02f7db538757921c9af0ff710adb45b84607e11.tar.gz
embtoolkit-a02f7db538757921c9af0ff710adb45b84607e11.tar.bz2
embtoolkit-a02f7db538757921c9af0ff710adb45b84607e11.tar.xz
Build system: internal macros: improve __embtk_pkg_version
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
-rw-r--r--mk/macros.packages.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk
index 2582c53..d8d7126 100644
--- a/mk/macros.packages.mk
+++ b/mk/macros.packages.mk
@@ -146,7 +146,7 @@ __embtk_pkg_gitrev = $(or $(call __embtk_mk_uquote,$(CONFIG_EMBTK_$(PKGV)_GIT_R
__embtk_pkg_localgit = $(strip $(if $(__embtk_pkg_usegit), \
$(EMBTK_ROOT)/src/$(__embtk_pkg_refspec)/$(__embtk_pkg_name).git))
-__embtk_pkg_version = $(or $(strip $($(PKGV)_VERSION)),$(__embtk_pkg_usegit),$(__embtk_pkg_usesvn))
+__embtk_pkg_version = $(or $(__embtk_pkg_usegit),$(__embtk_pkg_usesvn),$(strip $($(PKGV)_VERSION)))
__embtk_pkg_package_f = $(strip $(embtk_dldir))/$(__embtk_pkg_package)
__embtk_pkg_srcdir = $(or $(__embtk_pkg_localgit),$(__embtk_pkg_localsvn),$(patsubst %/,%,$(strip $($(PKGV)_SRC_DIR))))