diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-03-11 16:57:13 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-03-11 16:59:08 +0100 |
| commit | 4ccf8e45d286e7e7a33f5f1482563daf620cb6e8 (patch) | |
| tree | 5b3e2f27d6eb1f7075379b5d564d9077ba325df1 | |
| parent | e091dce93de5247db06b6cac0e58d16ecc2100b2 (diff) | |
| download | embtoolkit-4ccf8e45d286e7e7a33f5f1482563daf620cb6e8.tar.gz embtoolkit-4ccf8e45d286e7e7a33f5f1482563daf620cb6e8.tar.bz2 embtoolkit-4ccf8e45d286e7e7a33f5f1482563daf620cb6e8.tar.xz | |
Build system: generic macros: rework __embtk_pkg_version internal macro
Rework __embtk_pkg_version and take into account packages defining a version
even if they use a scm repository as source.
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
| -rw-r--r-- | mk/macros.packages.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk index 8fd01d2..92931f1 100644 --- a/mk/macros.packages.mk +++ b/mk/macros.packages.mk @@ -133,7 +133,7 @@ __embtk_pkg_gitrev = $(or $(call __embtk_mk_unquotestr,$(CONFIG_EMBTK_$(PKGV)_G __embtk_pkg_localgit = $(strip $(if $(__embtk_pkg_usegit), \ $(EMBTK_ROOT)/src/$(__embtk_pkg_refspec)/$(__embtk_pkg_name).git)) -__embtk_pkg_version = $(or $(__embtk_pkg_usegit),$(__embtk_pkg_usesvn),$(strip $($(PKGV)_VERSION))) +__embtk_pkg_version = $(or $(strip $($(PKGV)_VERSION)),$(__embtk_pkg_usegit),$(__embtk_pkg_usesvn)) __embtk_pkg_package_f = $(strip $(DOWNLOAD_DIR))/$(__embtk_pkg_package) __embtk_pkg_srcdir = $(or $(__embtk_pkg_localgit),$(__embtk_pkg_localsvn),$(patsubst %/,%,$(strip $($(PKGV)_SRC_DIR)))) |