diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-21 07:41:41 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-21 07:41:41 +0200 |
| commit | 90f603e2be40d996c421ae8e95464e38911eabaf (patch) | |
| tree | a3a8aa942a9acf078eed1333404de22aaa106219 /package/ImageMagick | |
| parent | f9292cf478867567f80ad270d4351e9a48ef4d06 (diff) | |
s/TOPDIR/ADK_TOPDIR/
to avoid namespace collisions in some packages, rename TOPDIR.
Sorry you need to make cleandir && make prereq && make
Diffstat (limited to 'package/ImageMagick')
| -rw-r--r-- | package/ImageMagick/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile index 024ef0b8b..975fda5d9 100644 --- a/package/ImageMagick/Makefile +++ b/package/ImageMagick/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:= ImageMagick PKG_VERSION:= 6.7.6 @@ -36,7 +36,7 @@ PKGSB_DISPLAY:= libX11 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-${PKG_EXTRAVER}.tar.gz WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-${PKG_EXTRAVER} -include $(TOPDIR)/mk/package.mk +include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBIMAGEMAGICK,libimagemagick,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBIMAGEMAGICK},${PKGSC_LIBIMAGEMAGICK},${PKG_OPTS})) $(eval $(call PKG_template,CONVERT,convert,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_CONVERT},${PKGSD_CONVERT},${PKGSC_CONVERT})) @@ -79,4 +79,4 @@ display-install: $(INSTALL_DIR) $(IDIR_DISPLAY)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/display $(IDIR_DISPLAY)/usr/bin -include ${TOPDIR}/mk/pkg-bottom.mk +include ${ADK_TOPDIR}/mk/pkg-bottom.mk |