jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-01 23:47:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix <PKG_NAME>_VERSION variable setup

Browse Source 
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>
This commit is contained in:
Lionel Landwerlin 2010-09-19 01:21:15 +02:00 committed by Peter Korsgaard
parent 785fef108e
commit 763822e874
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
package/Makefile.package.in
View File

@ -337,21 +337,21 @@ define GENTARGETS_INNER
$(2)_TYPE = $(5) $(2)_TYPE = $(5)
$(2)_NAME = $(1) $(2)_NAME = $(1)
ifndef $(2)_VERSION
ifdef $(3)_VERSION
$(2)_VERSION = $($(3)_VERSION)
else
$(2)_VERSION = undefined
endif
endif
# Keep the package version that may contain forward slashes in the _DL_VERSION # Keep the package version that may contain forward slashes in the _DL_VERSION
# variable, then replace all forward slashes ('/') by underscores ('_') to # variable, then replace all forward slashes ('/') by underscores ('_') to
# sanitize the package version that is used in paths, directory and file names. # 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 # 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. # version control system branch or tag, for example remotes/origin/1_10_stable.
$(2)_DL_VERSION = $($(2)_VERSION) $(2)_DL_VERSION = $($(2)_VERSION)
$(2)_VERSION = $(subst /,_,$($(2)_VERSION)) ifndef $(2)_VERSION
ifdef $(3)_VERSION
$(2)_VERSION = $($(3)_VERSION)
else
$(2)_VERSION = undefined
endif
else
$(2)_VERSION = $(subst /,_,$($(2)_VERSION))
endif
$(2)_BASE_NAME = $(1)-$$($(2)_VERSION) $(2)_BASE_NAME = $(1)-$$($(2)_VERSION)
$(2)_DL_DIR = $$(DL_DIR)/$$($(2)_BASE_NAME) $(2)_DL_DIR = $$(DL_DIR)/$$($(2)_BASE_NAME)