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/git/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/git') diff --git a/package/git/Makefile b/package/git/Makefile index 62cd92adf..758c90c16 100644 --- a/package/git/Makefile +++ b/package/git/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:= git PKG_VERSION:= 2.0.0 @@ -14,7 +14,7 @@ PKG_DEPENDS:= libopenssl libcurl libexpat libpthread PKG_URL:= http://git-scm.com/ PKG_SITES:= https://www.kernel.org/pub/software/scm/git/ -include $(TOPDIR)/mk/package.mk +include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,GIT,git,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -41,4 +41,4 @@ git-install: $(CP) $(WRKINST)/usr/bin/git-upload-archive $(IDIR_GIT)/usr/bin ${CP} $(WRKINST)/usr/libexec/git-core/* $(IDIR_GIT)/usr/libexec/git-core -include ${TOPDIR}/mk/pkg-bottom.mk +include ${ADK_TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3