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/scons/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'package/scons') diff --git a/package/scons/Makefile b/package/scons/Makefile index 74ff9c87b..bd0d4f0b5 100644 --- a/package/scons/Makefile +++ b/package/scons/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:= scons PKG_VERSION:= 2.3.0 @@ -17,8 +17,8 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz PKG_CFLINE_SCONS:= depends on ADK_HOST_ONLY -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,SCONS,scons,$(PKG_VERSION)-${PKG_RELEASE})) @@ -28,5 +28,5 @@ scons-hostinstall: (cd $(WRKBUILD); PATH='$(HOST_PATH)' python setup.py install \ --prefix=$(STAGING_HOST_DIR)/usr) -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