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 /devel | |
| 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 'devel')
| -rw-r--r-- | devel/cervisia/Makefile | 8 | ||||
| -rw-r--r-- | devel/kdbg/Makefile | 6 | ||||
| -rw-r--r-- | devel/kdevelop/Makefile | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/devel/cervisia/Makefile b/devel/cervisia/Makefile index eca198a13c7..1376cb3b29c 100644 --- a/devel/cervisia/Makefile +++ b/devel/cervisia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:15 agc Exp $ +# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:38 agc Exp $ # DISTNAME= cervisia-0.5.0 @@ -14,9 +14,9 @@ DEPENDS+= cvs-1.10:../../devel/cvs USE_X11BASE= yes # To get this near KDE GNU_CONFIGURE= yes -CONFIGURE_ENV+= "QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" -CONFIGURE_ARGS+=--with-qt-includes=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/include \ - --with-qt-libraries=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/lib \ +CONFIGURE_ENV+= "QTDIR=`${MAKE} show-qt1-prefix`/qt1" +CONFIGURE_ARGS+=--with-qt-includes=`${MAKE} show-qt1-prefix`/qt1/include \ + --with-qt-libraries=`${MAKE} show-qt1-prefix`/qt1/lib \ --with-extra-includes=${LOCALBASE}/include \ --with-extra-libs=${LOCALBASE}/lib diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile index bcc339301c2..f05580517dc 100644 --- a/devel/kdbg/Makefile +++ b/devel/kdbg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2000/07/10 15:08:16 agc Exp $ +# $NetBSD: Makefile,v 1.12 2000/07/11 14:53:39 agc Exp $ DISTNAME= kdbg-1.0.1 CATEGORIES= devel kde @@ -18,8 +18,8 @@ USE_X11BASE= yes USE_GMAKE= yes USE_PKGLIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \ - --with-qt-includes=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/include \ +CONFIGURE_ARGS= --with-qt-dir=`${MAKE} show-qt1-prefix`/qt1 \ + --with-qt-includes=`${MAKE} show-qt1-prefix`/qt1/include \ --with-extra-libs=${LOCALBASE}/lib \ --with-extra-includes=${LOCALBASE}/include diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 692b53e57a1..d2ad6b16ed2 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2000/07/10 15:08:16 agc Exp $ +# $NetBSD: Makefile,v 1.15 2000/07/11 14:53:39 agc Exp $ DISTNAME= kdevelop-1.2 CATEGORIES= devel kde @@ -22,9 +22,9 @@ USE_PKGLIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-extra-includes=${LOCALBASE}/include \ --with-extra-libs=${LOCALBASE}/lib \ - --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} QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" +CONFIGURE_ENV= "KDEDIR=${PREFIX} QTDIR=`${MAKE} show-qt1-prefix`/qt1" .include "../../mk/bsd.pkg.mk" |