Commit 763822e8 authored by Lionel Landwerlin's avatar Lionel Landwerlin Committed by Peter Korsgaard
Browse files

Fix <PKG_NAME>_VERSION variable setup 



Commit 993e51bc introduced a problem
to compute <PKG_NAME>_VERSION variable when PKG_NAME start with
'HOST_'.

Signed-off-by: default avatarLionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 785fef10

package/Makefile.package.in

+8 −8
Original line number Diff line number Diff line
@@ -337,21 +337,21 @@ define GENTARGETS_INNER 
$(2)_TYPE                       =  $(5)

$(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

# 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



$(2)_BASE_NAME	=  $(1)-$$($(2)_VERSION)

$(2)_DL_DIR	=  $$(DL_DIR)/$$($(2)_BASE_NAME)