summaryrefslogtreecommitdiff
path: root/x11/fvwm2/Makefile
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>2000-07-14 16:04:19 +0000
committeragc <agc@pkgsrc.org>2000-07-14 16:04:19 +0000
commit69cbb390716850e6a8c835f7b91ef8d8df65fb92 (patch)
treeaa658f354e6a972c06b16f22e2cbf7898068e0c8 /x11/fvwm2/Makefile
parent06a57d66d0054c05fe01defeb25c312035a3d99e (diff)
downloadpkgsrc-69cbb390716850e6a8c835f7b91ef8d8df65fb92.tar.gz
The previous method of using a make target for finding a prerequisite
package's prefix would not work as part of the environment specification via MAKE_ENV (as it would not be executed in the correct directory). Fix this by invoking pkg_info(1) directly, not via an intermediate make(1) step - this is not as clean, but more effective (i.e. it works).
Diffstat (limited to 'x11/fvwm2/Makefile')
-rw-r--r--x11/fvwm2/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/x11/fvwm2/Makefile b/x11/fvwm2/Makefile
index deeecb11848..edf8462dd71 100644
--- a/x11/fvwm2/Makefile
+++ b/x11/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2000/07/11 14:53:46 agc Exp $
+# $NetBSD: Makefile,v 1.25 2000/07/14 16:04:26 agc Exp $
# FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
#
@@ -25,7 +25,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-extras
CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/lib/X11/fvwm2
CONFIGURE_ARGS+= --libexecdir=${PREFIX}/lib/X11
-CONFIGURE_ARGS+= --with-xpm-includes=`${MAKE} show-xpm-prefix`/include
+CONFIGURE_ARGS+= --with-xpm-includes=`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`/include
CONFIGURE_ARGS+= --with-readline-includes=${LOCALBASE}/include
CONFIGURE_ARGS+= --with-rplay-includes=${LOCALBASE}/include
CONFIGURE_ARGS+= --with-iconpath=${PREFIX}/lib/X11/fvwm2/pixmaps:${X11ROOT}/include/bitmaps:${X11ROOT}/include/pixmaps