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/pcre/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'package/pcre/Makefile') diff --git a/package/pcre/Makefile b/package/pcre/Makefile index 3deee2bcc..66568b412 100644 --- a/package/pcre/Makefile +++ b/package/pcre/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:= pcre PKG_VERSION:= 8.34 @@ -20,8 +20,8 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz PKG_SUBPKGS:= LIBPCRE LIBPCRECPP PKGSD_LIBPCRECPP:= PCRE c++ library -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,PCRE,pcre,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBPCRE,libpcre,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) @@ -39,5 +39,5 @@ libpcrecpp-install: ${INSTALL_DIR} ${IDIR_LIBPCRECPP}/usr/lib ${CP} ${WRKINST}/usr/lib/libpcrecpp.so* ${IDIR_LIBPCRECPP}/usr/lib -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