diff options
| author | agc <agc> | 2000-07-15 20:39:13 +0000 |
|---|---|---|
| committer | agc <agc> | 2000-07-15 20:39:13 +0000 |
| commit | 99e9734c1322552385b4029f09f3dc349f4a2510 (patch) | |
| tree | 16d493248b3dac046feba96b3b2a8fb8abcc8be3 /x11/khostchooser | |
| parent | 52fb06f2eeb47f6a33f713dd9a58a5743c6b314f (diff) | |
| download | pkgsrc-99e9734c1322552385b4029f09f3dc349f4a2510.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 'x11/khostchooser')
| -rw-r--r-- | x11/khostchooser/Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/x11/khostchooser/Makefile b/x11/khostchooser/Makefile index 7ccf865d813..6db51437510 100644 --- a/x11/khostchooser/Makefile +++ b/x11/khostchooser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/07/14 16:04:27 agc Exp $ +# $NetBSD: Makefile,v 1.9 2000/07/15 20:39:26 agc Exp $ # DISTNAME= khostchooser-0.3 @@ -18,12 +18,14 @@ WRKSRC= ${WRKDIR}/khostchooser USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes + +EVAL_PREFIX+= QT1DIR=qt1 CONFIGURE_ARGS= --datadir=${PREFIX}/share/kde \ - --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 \ - MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc \ + QTDIR=${QT1DIR}/qt1 \ + MOC=${QT1DIR}/qt1/bin/moc \ CXXFLAGS="${CFLAGS}" \ all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib" |