diff options
author | agc <agc@pkgsrc.org> | 2000-07-11 14:53:35 +0000 |
---|---|---|
committer | agc <agc@pkgsrc.org> | 2000-07-11 14:53:35 +0000 |
commit | 4aeac45f89e5a02fffd8d4fe20e8af07012ec4cd (patch) | |
tree | 07c067a284dd27eed2ac53c0ec79e856fd2442d9 /graphics | |
parent | 2892ff05e14ce39877f3b9724d09c369fa16359e (diff) | |
download | pkgsrc-4aeac45f89e5a02fffd8d4fe20e8af07012ec4cd.tar.gz |
Make the determination of the pre-req package's installed directory be
a bit more user-friendly.
Introduce a show-{gtk+,imlib,kdebase,qt1,qt2,xpm}-prefix target in
bsd.pkg.mk, and use "${MAKE} show-*-prefix" in package Makefiles.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/gimp-current/Makefile | 4 | ||||
-rw-r--r-- | graphics/gimp-helpbrowser/Makefile | 4 | ||||
-rw-r--r-- | graphics/gimp/Makefile | 4 | ||||
-rw-r--r-- | graphics/giram/Makefile | 4 | ||||
-rw-r--r-- | graphics/kdegraphics/Makefile | 4 | ||||
-rw-r--r-- | graphics/libwmf/Makefile | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/graphics/gimp-current/Makefile b/graphics/gimp-current/Makefile index 49e5bf664d8..87720e5fe0b 100644 --- a/graphics/gimp-current/Makefile +++ b/graphics/gimp-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2000/07/10 10:40:40 agc Exp $ +# $NetBSD: Makefile,v 1.20 2000/07/11 14:53:41 agc Exp $ DISTNAME= gimp-1.1.24 CATEGORIES= graphics @@ -23,7 +23,7 @@ USE_GMAKE= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`" \ +CONFIGURE_ARGS+= --with-gtk-prefix="`${MAKE} show-gtk+-prefix`" \ --disable-perl \ --disable-python CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" INTLLIBS="-lintl" \ diff --git a/graphics/gimp-helpbrowser/Makefile b/graphics/gimp-helpbrowser/Makefile index de0ff526786..2059ae32f0f 100644 --- a/graphics/gimp-helpbrowser/Makefile +++ b/graphics/gimp-helpbrowser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/07/10 10:40:40 agc Exp $ +# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:41 agc Exp $ DISTNAME= gimp-1.1.24 PKGNAME= ${DISTNAME:S/-/-helpbrowser-/} @@ -18,7 +18,7 @@ USE_X11BASE= yes USE_GMAKE= yes USE_PKGLIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`" \ +CONFIGURE_ARGS+= --with-gtk-prefix="`${MAKE} show-gtk+-prefix`" \ --disable-perl \ --disable-python CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" INTLLIBS="-lintl" \ diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index 2e64d5b34e9..4809998fd7f 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2000/07/10 10:40:41 agc Exp $ +# $NetBSD: Makefile,v 1.54 2000/07/11 14:53:42 agc Exp $ DISTNAME= gimp-1.0.4 CATEGORIES= graphics @@ -28,7 +28,7 @@ USE_X11BASE= yes USE_GMAKE= yes USE_PKGLIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`" +CONFIGURE_ARGS+= --with-gtk-prefix="`${MAKE} show-gtk+-prefix`" CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" INFO_FILES= pdb.info diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile index 7ba067d7de1..112a8b2d6ea 100644 --- a/graphics/giram/Makefile +++ b/graphics/giram/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2000/07/10 10:40:41 agc Exp $ +# $NetBSD: Makefile,v 1.10 2000/07/11 14:53:42 agc Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1999/06/19 17:38:24 cpiazza Exp $ DISTNAME= Giram-0.1.2 @@ -17,7 +17,7 @@ DEPENDS+= povray-*:../../graphics/povray USE_X11= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`/bin/gtk-config" \ +CONFIGURE_ENV= GTK_CONFIG="`${MAKE} show-gtk+-prefix`/bin/gtk-config" \ CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" ALL_TARGET= install-strip diff --git a/graphics/kdegraphics/Makefile b/graphics/kdegraphics/Makefile index a3439ffff8d..7f876580111 100644 --- a/graphics/kdegraphics/Makefile +++ b/graphics/kdegraphics/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2000/07/10 15:08:17 agc Exp $ +# $NetBSD: Makefile,v 1.29 2000/07/11 14:53:42 agc Exp $ # DISTNAME= kdegraphics-1.1.2 @@ -16,7 +16,7 @@ USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ - "--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" + "--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1" CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ CXXFLAGS="${CFLAGS}" \ diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index 1d1cf949753..f4e110edd32 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/07/11 09:31:33 agc Exp $ +# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:42 agc Exp $ # DISTNAME= libwmf-0.1.17 @@ -22,7 +22,7 @@ USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-png="${LOCALBASE}" CONFIGURE_ARGS+= --with-ttf="${LOCALBASE}" -CONFIGURE_ARGS+= --with-xpm="`${PKG_INFO} -qp xpm | ${AWK} '{ print $$2 }'`" +CONFIGURE_ARGS+= --with-xpm="`${MAKE} show-xpm-prefix`" CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include |