Invoke "xmkmf" with full pathname to avoid problems on systems with two

X11 installations like e.g. Solaris with OpenWindows and XFree86.

8 files changed, 17 insertions, 19 deletions

diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index 6d6f67a19c5..fc88664cb3e 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/25 04:17:46 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 2001/03/11 16:19:45 tron Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/10/10 06:53:35 obrien Exp
 #
 
@@ -16,7 +16,7 @@ NO_WRKSUBDIR=		yes
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./Configure
 USE_IMAKE=		yes
-XMKMF=			xmkmf # don't specify -a option
+XMKMF=			${X11BASE}/bin/xmkmf # don't specify -a option
 
 ALL_TARGET=		y.tab.c depend spim xspim
 
diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile
index 871ec05a943..bb0a22807ac 100644
--- a/graphics/magicpoint/Makefile
+++ b/graphics/magicpoint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/03/04 09:06:13 tron Exp $
+# $NetBSD: Makefile,v 1.21 2001/03/11 16:19:46 tron Exp $
 
 DISTNAME=		magicpoint-1.07a
 CATEGORIES=		x11 graphics
@@ -22,7 +22,7 @@ CONFIGURE_ENV+=		LIBS="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE
 # We need to perform the steps normally done by ``xmkmf -a'' since some
 # files need to be created before ``make depend''.
 #
-XMKMF=			xmkmf
+XMKMF=			${X11BASE}/bin/xmkmf
 
 post-configure:
 	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ctlwords.h
diff --git a/graphics/xanim/Makefile b/graphics/xanim/Makefile
index 9233ccffa96..c2805615a8b 100644
--- a/graphics/xanim/Makefile
+++ b/graphics/xanim/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/02/16 15:22:35 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.20 2001/03/11 16:19:45 tron Exp $
 
 DISTNAME=	xanim2801
 PKGNAME=	xanim-2.80.1
@@ -29,9 +28,8 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-USE_X11BASE=	yes
-USE_IMAKE=	yes
-XMKMF=			xmkmf -a
+USE_X11BASE=	YES
+USE_IMAKE=	YES
 
 post-extract:
 	@${LN} -s docs/xanim.man ${WRKSRC}
diff --git a/japanese/canuum/Makefile b/japanese/canuum/Makefile
index edd4172e2bf..53ad254f345 100644
--- a/japanese/canuum/Makefile
+++ b/japanese/canuum/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 15:25:13 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/03/11 16:19:46 tron Exp $
 #
 
 DISTNAME=	canuum-1.0
@@ -28,7 +28,7 @@ pre-patch:
 	@(cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < Canuum.patch)
 
 do-configure:
-	@(cd ${WRKSRC}; xmkmf; ${MAKE} ${MAKE_ARGS} Makefile; \
+	@(cd ${WRKSRC}; ${X11BASE}/bin/xmkmf; ${MAKE} ${MAKE_ARGS} Makefile; \
 	${MAKE} ${MAKE_ARGS} cannaconf.h; ${MAKE} ${MAKE_ARGS} depend)
 
 do-build:
diff --git a/japanese/sj3-lib/Makefile b/japanese/sj3-lib/Makefile
index 8ca89c6765d..8f21d3fcee5 100644
--- a/japanese/sj3-lib/Makefile
+++ b/japanese/sj3-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 15:25:29 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/03/11 16:19:46 tron Exp $
 # FreeBSD Id: Makefile,v 1.9 1998/11/28 05:08:27 asami Exp $
 
 DISTNAME=	sj3-2.0.1.20
@@ -16,6 +16,6 @@ pre-configure:
 		${WRKSRC}/Imakefile.orig > ${WRKSRC}/Imakefile
 
 do-configure:
-	@(cd ${WRKSRC}; xmkmf; ${MAKE} Makefiles)
+	@(cd ${WRKSRC}; ${X11BASE}/bin/xmkmf; ${MAKE} Makefiles)
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/japanese/sj3-server/Makefile b/japanese/sj3-server/Makefile
index ea5c989a3e4..1448cc02165 100644
--- a/japanese/sj3-server/Makefile
+++ b/japanese/sj3-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/16 15:25:29 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/03/11 16:19:46 tron Exp $
 #
 
 DISTNAME=	sj3-2.0.1.20
@@ -42,7 +42,7 @@ pre-configure:
 	 done
 
 do-configure:
-	@(cd ${WRKSRC}; xmkmf; ${MAKE} Makefiles)
+	@(cd ${WRKSRC}; ${X11BASE}/bin/xmkmf; ${MAKE} Makefiles)
 
 post-build:
 	@${ECHO} '#!/bin/sh'				 > ${STARTUP_SCRIPT_SRC}
diff --git a/wm/fvwm1/Makefile b/wm/fvwm1/Makefile
index f4610412f01..1562671efc7 100644
--- a/wm/fvwm1/Makefile
+++ b/wm/fvwm1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:20 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2001/03/11 16:19:46 tron Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -19,7 +19,7 @@ NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
 
 USE_IMAKE=	yes
 # drop -a because we have no `depends' target
-XMKMF=		${SH} -c "xmkmf && ${MAKE} Makefiles"
+XMKMF=		${SH} -c "${X11BASE}/bin/xmkmf && ${MAKE} Makefiles"
 
 post-extract:
 	cd ${WRKSRC}/modules; \
diff --git a/x11/fvwm-wharf/Makefile b/x11/fvwm-wharf/Makefile
index 5f766185725..064dd8ffffb 100644
--- a/x11/fvwm-wharf/Makefile
+++ b/x11/fvwm-wharf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 17:06:21 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/03/11 16:19:47 tron Exp $
 
 DISTNAME=		AfterStep-1.0
 PKGNAME=		fvwm-wharf-1.0
@@ -13,7 +13,7 @@ USE_X11BASE=		YES
 USE_XPM=		YES
 
 do-configure:
-	(cd ${WRKSRC} ; xmkmf ; ${MAKE} Makefiles)
+	(cd ${WRKSRC}; ${X11BASE}/bin/xmkmf; ${MAKE} Makefiles)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/modules/Wharf/Wharf ${PREFIX}/bin/Fvwm-Wharf