diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/pkg-autotools.mk | 4 | ||||
| -rw-r--r-- | package/pkg-cmake.mk | 4 | ||||
| -rw-r--r-- | package/pkg-generic.mk | 4 | ||||
| -rw-r--r-- | package/pkg-luarocks.mk | 2 | ||||
| -rw-r--r-- | package/pkg-python.mk | 4 | ||||
| -rw-r--r-- | package/pkg-utils.mk | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index a66ecd4143..0ddfc6be06 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -275,5 +275,5 @@ endef # autotools-package -- the target generator macro for autotools packages ################################################################################ -autotools-package = $(call inner-autotools-package,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target) -host-autotools-package = $(call inner-autotools-package,host-$(call pkgname),$(call UPPERCASE,host-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host) +autotools-package = $(call inner-autotools-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),$(pkgparentdir),target) +host-autotools-package = $(call inner-autotools-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),$(pkgparentdir),host) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 13be5570ca..36283f07c0 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -150,8 +150,8 @@ endef # cmake-package -- the target generator macro for CMake packages ################################################################################ -cmake-package = $(call inner-cmake-package,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target) -host-cmake-package = $(call inner-cmake-package,host-$(call pkgname),$(call UPPERCASE,host-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host) +cmake-package = $(call inner-cmake-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),$(pkgparentdir),target) +host-cmake-package = $(call inner-cmake-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),$(pkgparentdir),host) ################################################################################ # Generation of the CMake toolchain file diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 1b99c2a25d..eea530f2a6 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -617,8 +617,8 @@ endef # inner-generic-package ################################################################################ # In the case of target packages, keep the package name "pkg" -generic-package = $(call inner-generic-package,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target) +generic-package = $(call inner-generic-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),$(pkgparentdir),target) # In the case of host packages, turn the package name "pkg" into "host-pkg" -host-generic-package = $(call inner-generic-package,host-$(call pkgname),$(call UPPERCASE,host-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host) +host-generic-package = $(call inner-generic-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),$(pkgparentdir),host) # :mode=makefile: diff --git a/package/pkg-luarocks.mk b/package/pkg-luarocks.mk index e82818a0c4..fdd26c750c 100644 --- a/package/pkg-luarocks.mk +++ b/package/pkg-luarocks.mk @@ -78,5 +78,5 @@ endef # luarocks-package -- the target generator macro for LuaRocks packages ################################################################################ -luarocks-package = $(call inner-luarocks-package,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target) +luarocks-package = $(call inner-luarocks-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),$(pkgparentdir),target) # host-luarocks-package not supported diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 79e6bcfa68..9cfd8200f4 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -220,5 +220,5 @@ endef # python-package -- the target generator macro for Python packages ################################################################################ -python-package = $(call inner-python-package,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target) -host-python-package = $(call inner-python-package,host-$(call pkgname),$(call UPPERCASE,host-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host) +python-package = $(call inner-python-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),$(pkgparentdir),target) +host-python-package = $(call inner-python-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),$(pkgparentdir),host) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 851575c547..51dd7384ba 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -59,8 +59,8 @@ endef # pkgdir macro is carefully written to handle the case of the Linux # package, for which the package directory is an empty string. pkgdir = $(dir $(lastword $(MAKEFILE_LIST))) -pkgname = $(lastword $(subst /, ,$(call pkgdir))) -pkgparentdir = $(patsubst %$(call pkgname)/,%,$(call pkgdir)) +pkgname = $(lastword $(subst /, ,$(pkgdir))) +pkgparentdir = $(patsubst %$(pkgname)/,%,$(pkgdir)) # Define extractors for different archive suffixes INFLATE.bz2 = $(BZCAT) |
