From 90f603e2be40d996c421ae8e95464e38911eabaf Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 21 Jun 2014 07:41:41 +0200 Subject: s/TOPDIR/ADK_TOPDIR/ to avoid namespace collisions in some packages, rename TOPDIR. Sorry you need to make cleandir && make prereq && make --- BSDmakefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'BSDmakefile') diff --git a/BSDmakefile b/BSDmakefile index 1720ba495..c1a9c08e7 100644 --- a/BSDmakefile +++ b/BSDmakefile @@ -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. -TOPDIR= ${.CURDIR} +ADK_TOPDIR= ${.CURDIR} PWD= ${.CURDIR} .include "${.CURDIR}/Makefile.inc" @@ -9,7 +9,7 @@ PWD= ${.CURDIR} .if defined(package) && !empty(package) subdir:= package/${package} . if !make(clean) -_subdir_dep:= ${TOPDIR}/.config +_subdir_dep:= ${ADK_TOPDIR}/.config . endif .endif @@ -22,7 +22,7 @@ _subdir: ${_subdir_dep} echo >&2 Error: you must build with “umask 022”, sorry.; \ exit 1; \ fi - cd ${.CURDIR}/${subdir} && TOPDIR=${.CURDIR} DEVELOPER=1 \ + cd ${.CURDIR}/${subdir} && ADK_TOPDIR=${.CURDIR} DEVELOPER=1 \ ${GMAKE} VERBOSE=1 ${.MFLAGS} ${_subdir} . include "${.CURDIR}/prereq.mk" -- cgit v1.2.3