summaryrefslogtreecommitdiff
path: root/x11/rxvt
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>2000-07-15 20:39:13 +0000
committeragc <agc@pkgsrc.org>2000-07-15 20:39:13 +0000
commit78748d628ac4db618c18ea933eb98fe9246df465 (patch)
tree16d493248b3dac046feba96b3b2a8fb8abcc8be3 /x11/rxvt
parentdd401e22851828e896a3520cc4279e86e69fdb8e (diff)
downloadpkgsrc-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 'x11/rxvt')
-rw-r--r--x11/rxvt/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index 55e37f5acab..c33a138446b 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/07/14 16:04:28 agc Exp $
+# $NetBSD: Makefile,v 1.17 2000/07/15 20:39:27 agc Exp $
# FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp
#
@@ -15,6 +15,8 @@ DEPENDS+= xpm-3.4k:../../graphics/xpm
USE_X11BASE= yes
GNU_CONFIGURE= yes
+
+EVAL_PREFIX+= XPMDIR=xpm
CONFIGURE_ARGS+= --enable-utmp \
--enable-wtmp \
--enable-lastlog \
@@ -32,7 +34,7 @@ CONFIGURE_ARGS+= --enable-utmp \
--enable-frills \
--enable-keepscrolling \
--enable-mousewheel \
- --with-xpm-includes=`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`/include/X11 \
- --with-xpm-library=`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`/lib
+ --with-xpm-includes=${XPMDIR}/include/X11 \
+ --with-xpm-library=${XPMDIR}/lib
.include "../../mk/bsd.pkg.mk"