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 /sysutils | |
| 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 'sysutils')
| -rw-r--r-- | sysutils/asapm/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/kapm/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/kdf/Makefile | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile index d0c30243100..14fec8b451e 100644 --- a/sysutils/asapm/Makefile +++ b/sysutils/asapm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2000/07/11 09:31:33 agc Exp $ +# $NetBSD: Makefile,v 1.11 2000/07/11 14:53:45 agc Exp $ # FreeBSD Id: Makefile,v 1.5 1998/11/29 12:43:12 asami Exp # @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes USE_X11= yes CONFIGURE_ARGS+= --disable-jpeg # there actually is no JPEG support CONFIGURE_ARGS+= --with-xpm \ - --with-xpm-includes="`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'`/include" \ - --with-xpm-library="`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'`/lib" + --with-xpm-includes="`${MAKE} show-xpm-prefix`/include" \ + --with-xpm-library="`${MAKE} show-xpm-prefix`/lib" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/kapm/Makefile b/sysutils/kapm/Makefile index e3c0ec19980..16052331400 100644 --- a/sysutils/kapm/Makefile +++ b/sysutils/kapm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2000/07/10 15:08:18 agc Exp $ +# $NetBSD: Makefile,v 1.7 2000/07/11 14:53:45 agc Exp $ # DISTNAME= kapm-0.3.1 @@ -16,8 +16,8 @@ DEPENDS+= kdebase-1.1.2:../../x11/kdebase USE_X11BASE= YES # to get things near KDE GNU_CONFIGURE= YES -CONFIGURE_ENV+= QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 -CONFIGURE_ENV+= MOC=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin/moc -CONFIGURE_ARGS+=--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 +CONFIGURE_ENV+= QTDIR=`${MAKE} show-qt1-prefix`/qt1 +CONFIGURE_ENV+= MOC=`${MAKE} show-qt1-prefix`/qt1/bin/moc +CONFIGURE_ARGS+=--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile index 8cab35135c6..6b2ae5543c4 100644 --- a/sysutils/kdf/Makefile +++ b/sysutils/kdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2000/07/11 10:10:55 agc Exp $ +# $NetBSD: Makefile,v 1.7 2000/07/11 14:53:45 agc Exp $ # DISTNAME= kdf-0.5.1 @@ -14,13 +14,13 @@ DEPENDS+= kde-1.1.2:../../x11/kde USE_X11BASE= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+=--datadir=`${PKG_INFO} -qp kdebase | ${AWK} '{print $$2}'`/share/kde \ - --with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \ +CONFIGURE_ARGS+=--datadir=`${MAKE} show-kdebase-prefix`/share/kde \ + --with-qt-dir=`${MAKE} show-qt1-prefix`/qt1 \ --enable-path-check CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ - QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \ - MOC=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin/moc \ + QTDIR=`${MAKE} show-qt1-prefix`/qt1 \ + MOC=`${MAKE} show-qt1-prefix`/qt1/bin/moc \ CXXFLAGS="${CFLAGS}" \ all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib" |