summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-06-12 20:39:13 +0000
committerjlam <jlam@pkgsrc.org>2001-06-12 20:39:13 +0000
commit0d141af71ad3a69de7c8d9e3bdcb096549e603c4 (patch)
tree78ec95096e82236ff0c331a6cdb6dfb83e4486eb /mk
parent328a35f96fe7ec11093e3847c0943eb3a41f2b51 (diff)
downloadpkgsrc-0d141af71ad3a69de7c8d9e3bdcb096549e603c4.tar.gz
Split XMKMF into XMKMF_CMD and XMKMF_FLAGS and set XMKMF_CMD conditionally
base on whether we use xpkgwedge or not.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk8
1 files changed, 5 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 1784528fb6a..1c0dc30362f 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.758 2001/06/12 20:30:09 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.759 2001/06/12 20:39:13 jlam Exp $
#
# This file is in the public domain.
#
@@ -97,11 +97,13 @@ SCRIPTS_ENV+= CLASSPATH=${CLASSPATH} JAVA_HOME=${JAVA_HOME}
.if exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \
exists(${X11BASE}/lib/X11/config/xpkgwedge.def)
X11PREFIX= ${LOCALBASE}
-XMKMF?= ${X11PREFIX}/bin/pkgxmkmf -a
+XMKMF_CMD?= ${X11PREFIX}/bin/pkgxmkmf
.else
X11PREFIX= ${X11BASE}
-XMKMF?= ${X11PREFIX}/bin/xmkmf -a
+XMKMF_CMD?= ${X11PREFIX}/bin/xmkmf
.endif
+XMKMF_FLAGS?= -a
+XMKMF?= ${XMKMF_CMD} ${XMKMF_FLAGS}
.if defined(USE_MOTIF12)
USE_MOTIF= # defined