summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Landwerlin <llandwerlin@gmail.com>2010-09-18 23:21:15 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-09-20 14:24:54 (GMT)
commit763822e874fd8d39b591feaa9639f76183897fb7 (patch)
tree8821b09933eeff0ce61bdb79008256e666fcb6e7
parent785fef108ebd940aeabe7e5c2d6d5f54f98e6146 (diff)
downloadbuildroot-763822e874fd8d39b591feaa9639f76183897fb7.tar.gz
buildroot-763822e874fd8d39b591feaa9639f76183897fb7.tar.bz2
Fix <PKG_NAME>_VERSION variable setup
Commit 993e51bc22f508fbaf39c5c49fd0595fc5c56013 introduced a problem to compute <PKG_NAME>_VERSION variable when PKG_NAME start with 'HOST_'. Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/Makefile.package.in16
1 files changed, 8 insertions, 8 deletions
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 58a9a51..377df65 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -337,22 +337,22 @@ define GENTARGETS_INNER
$(2)_TYPE = $(5)
$(2)_NAME = $(1)
+# Keep the package version that may contain forward slashes in the _DL_VERSION
+# variable, then replace all forward slashes ('/') by underscores ('_') to
+# sanitize the package version that is used in paths, directory and file names.
+# Forward slashes may appear in the package's version when pointing to a
+# version control system branch or tag, for example remotes/origin/1_10_stable.
+$(2)_DL_VERSION = $($(2)_VERSION)
ifndef $(2)_VERSION
ifdef $(3)_VERSION
$(2)_VERSION = $($(3)_VERSION)
else
$(2)_VERSION = undefined
endif
+else
+ $(2)_VERSION = $(subst /,_,$($(2)_VERSION))
endif
-# Keep the package version that may contain forward slashes in the _DL_VERSION
-# variable, then replace all forward slashes ('/') by underscores ('_') to
-# sanitize the package version that is used in paths, directory and file names.
-# Forward slashes may appear in the package's version when pointing to a
-# version control system branch or tag, for example remotes/origin/1_10_stable.
-$(2)_DL_VERSION = $($(2)_VERSION)
-$(2)_VERSION = $(subst /,_,$($(2)_VERSION))
-
$(2)_BASE_NAME = $(1)-$$($(2)_VERSION)
$(2)_DL_DIR = $$(DL_DIR)/$$($(2)_BASE_NAME)
$(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME)