summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authoragc <agc>2000-07-15 20:39:13 +0000
committeragc <agc>2000-07-15 20:39:13 +0000
commit2e47c2f37e9c8e19fbffffeab1f56ce32e02d121 (patch)
tree16d493248b3dac046feba96b3b2a8fb8abcc8be3 /misc
parent820a71a77a3d89ccc6a901be882dcc2ebe3a5d26 (diff)
downloadpkgsrc-2e47c2f37e9c8e19fbffffeab1f56ce32e02d121.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 'misc')
-rw-r--r--misc/kdeutils/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/misc/kdeutils/Makefile b/misc/kdeutils/Makefile
index 7f4a333f2cd..49bb513a761 100644
--- a/misc/kdeutils/Makefile
+++ b/misc/kdeutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2000/07/14 16:04:23 agc Exp $
+# $NetBSD: Makefile,v 1.40 2000/07/15 20:39:21 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1997/11/28 00:04:18 se Exp
#
@@ -16,7 +16,9 @@ DEPENDS+= kdebase-1.1.2:../../x11/kdebase
USE_X11BASE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= "--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1"
+
+EVAL_PREFIX+= QT1DIR=qt1
+CONFIGURE_ARGS= "--with-qt-dir=${QT1DIR}/qt1"
CFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ENV= KDEDIR=${PREFIX} \
CXXFLAGS="${CFLAGS}" \