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 /adk | |
| 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 'adk')
| -rw-r--r-- | adk/config/Makefile | 2 | ||||
| -rw-r--r-- | adk/config/Makefile.in | 2 | ||||
| -rw-r--r-- | adk/tests/master.exp.in | 2 | ||||
| -rw-r--r-- | adk/tools/Makefile | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/adk/config/Makefile b/adk/config/Makefile index 72ea07005..d1d8ac73a 100644 --- a/adk/config/Makefile +++ b/adk/config/Makefile @@ -2,7 +2,7 @@ # material, please see the LICENCE file in the top-level directory. ifneq ($(filter-out clean,${MAKECMDGOALS}),) -include ${TOPDIR}/rules.mk +include ${ADK_TOPDIR}/rules.mk endif CP=cp -fpR diff --git a/adk/config/Makefile.in b/adk/config/Makefile.in index 0b3ac40a9..506d04cab 100644 --- a/adk/config/Makefile.in +++ b/adk/config/Makefile.in @@ -2,4 +2,4 @@ ifeq ($(strip $(ADK_PACKAGE_CONFIG)),y) TARGETS+=config endif -include ${TOPDIR}/mk/pkg-bottom.mk +include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/adk/tests/master.exp.in b/adk/tests/master.exp.in index 72d8ab9e6..1a73e7852 100644 --- a/adk/tests/master.exp.in +++ b/adk/tests/master.exp.in @@ -1,4 +1,4 @@ -lappend boards_dir @TOPDIR@/tests +lappend boards_dir @ADK_TOPDIR@/tests lappend boards_dir /usr/share/dejagnu set myboard adk set target_list adk diff --git a/adk/tools/Makefile b/adk/tools/Makefile index edd559f85..fd0a3c791 100644 --- a/adk/tools/Makefile +++ b/adk/tools/Makefile @@ -1,7 +1,7 @@ # 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 $(ADK_TOPDIR)/rules.mk install: ${STAGING_HOST_DIR}/usr/bin/depmaker ${STAGING_HOST_DIR}/usr/bin/pkgrebuild ${STAGING_HOST_DIR}/usr/bin/dkgetsz @@ -14,4 +14,4 @@ ${STAGING_HOST_DIR}/usr/bin/pkgrebuild: pkgrebuild.c strmap.c ${STAGING_HOST_DIR}/usr/bin/dkgetsz: dkgetsz.c ${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -o $@ dkgetsz.c -include $(TOPDIR)/mk/tools.mk +include $(ADK_TOPDIR)/mk/tools.mk |