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/cairo/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'package/cairo') diff --git a/package/cairo/Makefile b/package/cairo/Makefile index 0eb325f18..d16fcd00a 100644 --- a/package/cairo/Makefile +++ b/package/cairo/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:= cairo PKG_VERSION:= 1.12.16 @@ -18,8 +18,8 @@ PKG_URL:= http://cairographics.org/ PKG_SITES:= http://cairographics.org/releases/ PKG_OPTS:= dev -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,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) @@ -52,5 +52,5 @@ cairo-install: ${CP} ${WRKINST}/usr/lib/libcairo*.so* ${IDIR_CAIRO}/usr/lib ${CP} ${WRKINST}/usr/lib/cairo/*.so* ${IDIR_CAIRO}/usr/lib/cairo -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