diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-21 07:41:41 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-21 07:41:41 +0200 |
commit | 90f603e2be40d996c421ae8e95464e38911eabaf (patch) | |
tree | a3a8aa942a9acf078eed1333404de22aaa106219 /target/Makefile | |
parent | f9292cf478867567f80ad270d4351e9a48ef4d06 (diff) |
s/TOPDIR/ADK_TOPDIR/
to avoid namespace collisions in some packages, rename TOPDIR.
Sorry you need to make cleandir && make prereq && make
Diffstat (limited to 'target/Makefile')
-rw-r--r-- | target/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/Makefile b/target/Makefile index 1ac375b62..d245f1a70 100644 --- a/target/Makefile +++ b/target/Makefile @@ -1,8 +1,8 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk -include $(TOPDIR)/mk/rootfs.mk +include $(ADK_TOPDIR)/rules.mk +include $(ADK_TOPDIR)/mk/rootfs.mk all: install @@ -26,11 +26,11 @@ ADK_PACKAGE_CRYPTINIT_SWAP:=$(strip $(subst ",, $(ADK_PACKAGE_CRYPTINIT_SWAP))) ADK_PACKAGE_CMDLINE:=root=$(ADK_PACKAGE_CRYPTINIT_ROOT) swap=$(ADK_PACKAGE_CRYPTINIT_SWAP) resume=/dev/mapper/swapcrypt ifeq (${ADK_TARGET_KERNEL_CUSTOMISING},y) -config-prepare: $(TOPDIR)/.config - @sed -n '/^ADK_KERNEL/s//CONFIG/p' ${TOPDIR}/.config \ +config-prepare: $(ADK_TOPDIR)/.config + @sed -n '/^ADK_KERNEL/s//CONFIG/p' ${ADK_TOPDIR}/.config \ >${BUILD_DIR}/.kernelconfig.kernel @if [ -f ${ADK_TARGET_ARCH}/kernel/${ADK_TARGET_KERNEL_MINICONFIG} ];then \ - cat ${TOPDIR}/target/linux/kernel.config \ + cat ${ADK_TOPDIR}/target/linux/kernel.config \ ${ADK_TARGET_ARCH}/kernel/${ADK_TARGET_KERNEL_MINICONFIG} > ${BUILD_DIR}/.kernelconfig.board; \ else \ echo "no miniconfig found for target system"; \ @@ -76,9 +76,9 @@ endif cp .kernelconfig.tmp .kernelconfig @-rm -f ${BUILD_DIR}/.kernelconfig.tmp else -config-prepare: $(TOPDIR)/.config +config-prepare: $(ADK_TOPDIR)/.config @if [ -f ${ADK_TARGET_ARCH}/kernel/${ADK_TARGET_KERNEL_MINICONFIG} ];then \ - cat ${TOPDIR}/target/linux/kernel.config \ + cat ${ADK_TOPDIR}/target/linux/kernel.config \ ${ADK_TARGET_ARCH}/kernel/${ADK_TARGET_KERNEL_MINICONFIG} > ${BUILD_DIR}/.kernelconfig.board; \ else \ echo "no miniconfig found for target system"; \ |