summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2014-09-17 22:58:38 +0200
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2014-09-17 22:58:38 +0200
commit6aedab6e856497af6a4ef5d2643d7a6eded9c6ff (patch)
tree49c09cef1f642194608766f37605b3e0f254ebac
parent92fb5cdcc8b28639f5f280175d14ea023129aa3f (diff)
downloadembtoolkit-6aedab6e856497af6a4ef5d2643d7a6eded9c6ff.tar.gz
embtoolkit-6aedab6e856497af6a4ef5d2643d7a6eded9c6ff.tar.bz2
embtoolkit-6aedab6e856497af6a4ef5d2643d7a6eded9c6ff.tar.xz
Build system: fix category detection while including a package
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
-rw-r--r--core/mk/pkg-macros/include.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/mk/pkg-macros/include.mk b/core/mk/pkg-macros/include.mk
index acc5279..a9455a7 100644
--- a/core/mk/pkg-macros/include.mk
+++ b/core/mk/pkg-macros/include.mk
@@ -58,7 +58,7 @@ define __embtk_include_pkg
# preset some variables
$(eval __embtk_$(pkgv)_category := $(call __embtk_mk_uquote,$(or $(CONFIG_EMBTK_$(PKGV)_REFSPEC),$(CONFIG_EMBTK_$(PKGV)_CATEGORY))))
$(eval __embtk_xpkg_category := $(lastword $(subst /,$(embtk_space),$(embtk_pkgincdir))))
- __embtk_$(pkgv)_category := $(or $(___embtk_$(pkgv)_category),$(__embtk_xpkg_category))
+ __embtk_$(pkgv)_category := $(or $(__embtk_$(pkgv)_category),$(__embtk_xpkg_category))
endef
define embtk_include_hostpkg
@@ -135,5 +135,5 @@ define __embtk_include_xtoolpkg
endif
# preset some variables
$(eval __embtk_$(pkgv)_category := $(call __embtk_mk_uquote,$(or $(CONFIG_EMBTK_$(PKGV)_REFSPEC),$(CONFIG_EMBTK_$(PKGV)_CATEGORY))))
- __embtk_$(pkgv)_category := $(or $(___embtk_$(pkgv)_category),$(2))
+ __embtk_$(pkgv)_category := $(or $(__embtk_$(pkgv)_category),$(2))
endef