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/v4l-utils/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/v4l-utils/Makefile') diff --git a/package/v4l-utils/Makefile b/package/v4l-utils/Makefile index af3f6188c..18ae3a5fe 100644 --- a/package/v4l-utils/Makefile +++ b/package/v4l-utils/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:= v4l-utils PKG_VERSION:= 1.0.0 @@ -21,7 +21,7 @@ PKG_SUBPKGS:= V4L_UTILS LIBV4L PKGSC_LIBV4L:= libs/video PKGSD_LIBV4L:= Video4Linux2 libraries -include $(TOPDIR)/mk/package.mk +include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,V4L_UTILS,v4l-utils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBV4L,libv4l,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBV4L},${PKGSC_LIBV4L},${PKG_OPTS})) @@ -41,4 +41,4 @@ libv4l-install: $(CP) $(WRKINST)/usr/lib/libv4l/v4l{1compat,2convert}.so \ $(IDIR_LIBV4L)/usr/lib/libv4l -include ${TOPDIR}/mk/pkg-bottom.mk +include ${ADK_TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3