From cba9edbbee3433e5b2f1d8e195bff46814f8a31e Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Sun, 11 Mar 2001 16:19:45 +0000
Subject: Invoke "xmkmf" with full pathname to avoid problems on systems with
 two X11 installations like e.g. Solaris with OpenWindows and XFree86.

---
 graphics/magicpoint/Makefile | 4 ++--
 graphics/xanim/Makefile      | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'graphics')

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}
-- 
cgit v1.2.3