diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | mk/pkg-macros/incl.mk | 8 |
2 files changed, 7 insertions, 5 deletions
@@ -1,6 +1,6 @@ ################################################################################ # EmbToolkit -# Copyright(C) 2009-2013 Abdoulaye Walsimou GAYE. +# Copyright(C) 2009-2014 Abdoulaye Walsimou GAYE. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -109,6 +109,8 @@ SUFFIXES := %: RCS/% %: s.% %: SCCS/s.% +%.mk: ; +%.kconfig: ; # # Include our config if any diff --git a/mk/pkg-macros/incl.mk b/mk/pkg-macros/incl.mk index bcd8402..8a73cc9 100644 --- a/mk/pkg-macros/incl.mk +++ b/mk/pkg-macros/incl.mk @@ -44,11 +44,11 @@ define __embtk_include_pkg endif ifeq (x$(__embtk_incenabled-y),xy) ROOTFS_COMPONENTS-y += $(pkgv)_install + # also include old package kconfig entries if any + -include $(__embtk_pkg_dotkconfig_f) else ifeq (x$(__embtk_incinstalled-y),xy) ROOTFS_COMPONENTS- += $(pkgv)_install endif - # also include old package kconfig entries if any - -include $(__embtk_pkg_dotkconfig_f) endef define embtk_include_hostpkg @@ -70,9 +70,9 @@ define __embtk_include_hostpkg endif ifeq (x$(__embtk_incenabled-y),xy) HOSTTOOLS_COMPONENTS-y += $(pkgv)_install + # also include old package kconfig entries if any + -include $(__embtk_pkg_dotkconfig_f) else ifeq (x$(__embtk_incinstalled-y),xy) HOSTTOOLS_COMPONENTS- += $(pkgv)_install endif - # also include old package kconfig entries if any - -include $(__embtk_pkg_dotkconfig_f) endef |