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
---
 package/uclibc++/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'package/uclibc++/Makefile')

diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile
index de0321bb3..10dab02c2 100644
--- a/package/uclibc++/Makefile
+++ b/package/uclibc++/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
 
 PKG_NAME:=		uClibc++
 PKG_VERSION:=		0.2.4
@@ -19,14 +19,14 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 PKG_LIBC_DEPENDS:=	uclibc
 
-include ${TOPDIR}/mk/package.mk
+include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,UCLIBCXX,uclibc++,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIG_STYLE:=          manual
 INSTALL_STYLE:=         manual
 
-MAKE_FLAGS+=		TOPDIR="${WRKBUILD}/" \
+MAKE_FLAGS+=		ADK_TOPDIR="${WRKBUILD}/" \
 			${TARGET_CONFIGURE_OPTS} \
 			ARCH_CFLAGS="${TARGET_CFLAGS}" \
 			CROSS="${TARGET_CROSS}"
@@ -41,4 +41,4 @@ do-install:
 	${INSTALL_DIR} ${WRKINST}/usr/include
 	${CP} ${WRKBUILD}/include ${WRKINST}/usr/include/uClibc++
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3