From 90f603e2be40d996c421ae8e95464e38911eabaf Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
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
---
 GNUmakefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'GNUmakefile')

diff --git a/GNUmakefile b/GNUmakefile
index b5dd3eea3..ab512a2af 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,14 +1,14 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-TOPDIR:=	$(shell pwd)
-PWD:=		${TOPDIR}
+ADK_TOPDIR:=	$(shell pwd)
+PWD:=		${ADK_TOPDIR}
 
 include Makefile.inc
 
 ifneq (${package},)
 subdir:=	package/${package}
-_subdir_dep:=	${TOPDIR}/.config
+_subdir_dep:=	${ADK_TOPDIR}/.config
 endif
 
 ifneq (${subdir},)
@@ -19,7 +19,7 @@ _subdir: ${_subdir_dep}
 		echo >&2 Error: you must build with “umask 022”, sorry.; \
 		exit 1; \
 	fi
-	cd ${subdir} && TOPDIR=${TOPDIR} DEVELOPER=1 \
+	cd ${subdir} && ADK_TOPDIR=${ADK_TOPDIR} DEVELOPER=1 \
 	    make VERBOSE=1 ${MAKEFLAGS} ${MAKECMDGOALS}
 
 include prereq.mk
-- 
cgit v1.2.3