diff options
| author | agc <agc@pkgsrc.org> | 2000-07-15 20:39:13 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2000-07-15 20:39:13 +0000 |
| commit | 78748d628ac4db618c18ea933eb98fe9246df465 (patch) | |
| tree | 16d493248b3dac046feba96b3b2a8fb8abcc8be3 /devel | |
| parent | dd401e22851828e896a3520cc4279e86e69fdb8e (diff) | |
| download | pkgsrc-78748d628ac4db618c18ea933eb98fe9246df465.tar.gz | |
Instead of the clunky SHOW_PKG_PREFIX, introduce an EVAL_PREFIX definition,
which takes entries of the format <make-definition-name>=<pkgname>. This
has not been added to MAKEFLAGS because (a) premature optimisation is the
root of all evil, and (b) because the .for loop used to implement this
shows the wrong results when multiple prefices are evaluated.
Modify all the package Makefiles to use EVAL_PREFIX, thereby simplifying
them considerably.
ALso simplify the logic to calculate the prefix as well.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/cervisia/Makefile | 10 | ||||
| -rw-r--r-- | devel/kdbg/Makefile | 8 | ||||
| -rw-r--r-- | devel/kdevelop/Makefile | 8 |
3 files changed, 16 insertions, 10 deletions
diff --git a/devel/cervisia/Makefile b/devel/cervisia/Makefile index 7e8f236f9bc..2da18074754 100644 --- a/devel/cervisia/Makefile +++ b/devel/cervisia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:20 agc Exp $ +# $NetBSD: Makefile,v 1.8 2000/07/15 20:39:16 agc Exp $ # DISTNAME= cervisia-0.5.0 @@ -14,9 +14,11 @@ DEPENDS+= cvs-1.10:../../devel/cvs USE_X11BASE= yes # To get this near KDE GNU_CONFIGURE= yes -CONFIGURE_ENV+= "QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" -CONFIGURE_ARGS+=--with-qt-includes=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/include \ - --with-qt-libraries=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/lib \ + +EVAL_PREFIX+= QT1DIR=qt1 +CONFIGURE_ENV+= "QTDIR=${QT1DIR}/qt1" +CONFIGURE_ARGS+=--with-qt-includes=${QT1DIR}/qt1/include \ + --with-qt-libraries=${QT1DIR}/qt1/lib \ --with-extra-includes=${LOCALBASE}/include \ --with-extra-libs=${LOCALBASE}/lib diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile index e9ee74ae46a..44c08fd3b68 100644 --- a/devel/kdbg/Makefile +++ b/devel/kdbg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2000/07/14 16:04:21 agc Exp $ +# $NetBSD: Makefile,v 1.14 2000/07/15 20:39:16 agc Exp $ DISTNAME= kdbg-1.0.1 CATEGORIES= devel kde @@ -18,8 +18,10 @@ USE_X11BASE= yes USE_GMAKE= yes USE_PKGLIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \ - --with-qt-includes=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/include \ + +EVAL_PREFIX+= QT1DIR=qt1 +CONFIGURE_ARGS= --with-qt-dir=${QT1DIR}/qt1 \ + --with-qt-includes=${QT1DIR}/qt1/include \ --with-extra-libs=${LOCALBASE}/lib \ --with-extra-includes=${LOCALBASE}/include diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 18770158ec1..4aa3be5f4ad 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2000/07/14 16:04:21 agc Exp $ +# $NetBSD: Makefile,v 1.17 2000/07/15 20:39:17 agc Exp $ DISTNAME= kdevelop-1.2 CATEGORIES= devel kde @@ -20,11 +20,13 @@ USE_X11BASE= yes USE_GMAKE= yes USE_PKGLIBTOOL= yes GNU_CONFIGURE= yes + +EVAL_PREFIX+= QT1DIR=qt1 CONFIGURE_ARGS= --with-extra-includes=${LOCALBASE}/include \ --with-extra-libs=${LOCALBASE}/lib \ - --with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 + --with-qt-dir=${QT1DIR}/qt1 CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= "KDEDIR=${PREFIX} QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" +CONFIGURE_ENV= "KDEDIR=${PREFIX} QTDIR=${QT1DIR}/qt1" .include "../../mk/bsd.pkg.mk" |