summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2001-03-11 09:51:59 +0000
committertron <tron@pkgsrc.org>2001-03-11 09:51:59 +0000
commit7ba19104247048df7a2047f7f08deb67862f1220 (patch)
treee6b2952f99f5bc761c61296ce6ca22a85bf8da3f
parent5f48fd7061e055fa8057f196328c5ce058648d16 (diff)
downloadpkgsrc-7ba19104247048df7a2047f7f08deb67862f1220.tar.gz
Invoke "xmkmf" with full pathname to avoid problems on systems with two
X11 installations like e.g. Solaris with OpenWindows and XFree86.
-rw-r--r--mk/bsd.pkg.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 96016d93350..7c0293a019f 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.682 2001/03/07 16:04:55 wiz Exp $
+# $NetBSD: bsd.pkg.mk,v 1.683 2001/03/11 09:51:59 tron Exp $
#
# This file is in the public domain.
#
@@ -90,10 +90,10 @@ 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?= pkgxmkmf -a
+XMKMF?= ${X11PREFIX}/bin/pkgxmkmf -a
.else
X11PREFIX= ${X11BASE}
-XMKMF?= xmkmf -a
+XMKMF?= ${X11PREFIX}/bin/xmkmf -a
.endif
.if defined(USE_MOTIF12)