From f36f0d3802c198309b1d10821ab5367924abb1fa Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
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.

---
 japanese/canuum/Makefile     | 4 ++--
 japanese/sj3-lib/Makefile    | 4 ++--
 japanese/sj3-server/Makefile | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'japanese')

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