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 --- package/bzip2/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'package/bzip2/Makefile') diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile index 304329d55..4c5a01333 100644 --- a/package/bzip2/Makefile +++ b/package/bzip2/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:= bzip2 PKG_VERSION:= 1.0.6 @@ -23,8 +23,8 @@ PKG_SUBPKGS:= BZIP2 LIBBZ2 PKGSD_LIBBZ2:= bzip2 compression library PKGSC_LIBBZ2:= libs/misc -include ${TOPDIR}/mk/host.mk -include ${TOPDIR}/mk/package.mk +include ${ADK_TOPDIR}/mk/host.mk +include ${ADK_TOPDIR}/mk/package.mk $(eval $(call HOST_template,BZIP2,bzip2,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,BZIP2,bzip2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -67,5 +67,5 @@ bzip2-install: ${INSTALL_DIR} ${IDIR_BZIP2}/usr/bin ${INSTALL_BIN} ${WRKBUILD}/$(BIN_FILE) ${IDIR_BZIP2}/usr/bin/bzip2 -include ${TOPDIR}/mk/host-bottom.mk -include ${TOPDIR}/mk/pkg-bottom.mk +include ${ADK_TOPDIR}/mk/host-bottom.mk +include ${ADK_TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3