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 /sysutils | |
| 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 'sysutils')
| -rw-r--r-- | sysutils/asapm/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/kapm/Makefile | 10 | ||||
| -rw-r--r-- | sysutils/kdf/Makefile | 12 |
3 files changed, 17 insertions, 12 deletions
diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile index 543846d97d2..e842c8f131d 100644 --- a/sysutils/asapm/Makefile +++ b/sysutils/asapm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2000/07/14 16:04:25 agc Exp $ +# $NetBSD: Makefile,v 1.13 2000/07/15 20:39:24 agc Exp $ # FreeBSD Id: Makefile,v 1.5 1998/11/29 12:43:12 asami Exp # @@ -20,8 +20,9 @@ DEPENDS+= xpm-*:../../graphics/xpm GNU_CONFIGURE= yes USE_X11= yes CONFIGURE_ARGS+= --disable-jpeg # there actually is no JPEG support +EVAL_PREFIX+= XPMDIR=xpm CONFIGURE_ARGS+= --with-xpm \ - --with-xpm-includes="`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`/include" \ - --with-xpm-library="`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`/lib" + --with-xpm-includes="${XPMDIR}/include" \ + --with-xpm-library="${XPMDIR}/lib" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/kapm/Makefile b/sysutils/kapm/Makefile index 7ad61c9319b..b12ddb2ddd5 100644 --- a/sysutils/kapm/Makefile +++ b/sysutils/kapm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/07/14 16:04:26 agc Exp $ +# $NetBSD: Makefile,v 1.9 2000/07/15 20:39:24 agc Exp $ # DISTNAME= kapm-0.3.1 @@ -16,8 +16,10 @@ DEPENDS+= kdebase-1.1.2:../../x11/kdebase USE_X11BASE= YES # to get things near KDE GNU_CONFIGURE= YES -CONFIGURE_ENV+= QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 -CONFIGURE_ENV+= MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc -CONFIGURE_ARGS+=--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 + +EVAL_PREFIX+= QT1DIR=qt1 +CONFIGURE_ENV+= QTDIR=${QT1DIR}/qt1 +CONFIGURE_ENV+= MOC=${QT1DIR}/qt1/bin/moc +CONFIGURE_ARGS+=--with-qt-dir=${QT1DIR}/qt1 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile index 3e687b7cfb8..5a6d92c78db 100644 --- a/sysutils/kdf/Makefile +++ b/sysutils/kdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/07/14 16:04:26 agc Exp $ +# $NetBSD: Makefile,v 1.9 2000/07/15 20:39:24 agc Exp $ # DISTNAME= kdf-0.5.1 @@ -14,13 +14,15 @@ DEPENDS+= kde-1.1.2:../../x11/kde USE_X11BASE= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+=--datadir=`${SHOW_PREFIX1} kdebase ${SHOW_PREFIX2}`/share/kde \ - --with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \ + +EVAL_PREFIX+= KDEBASEDIR=kdebase QT1DIR=qt1 +CONFIGURE_ARGS+=--datadir=${KDEBASEDIR}/share/kde \ + --with-qt-dir=${QT1DIR}/qt1 \ --enable-path-check CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ - QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \ - MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc \ + QTDIR=${QT1DIR}/qt1 \ + MOC=${QT1DIR}/qt1/bin/moc \ CXXFLAGS="${CFLAGS}" \ all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib" |