$NetBSD: patch-ae,v 1.6 2001/05/02 21:46:08 dmcmahill Exp $
 
--- ./XView.tmpl.orig	Sun Jun 26 22:10:00 1994
+++ ./XView.tmpl	Tue May  1 22:40:31 2001
@@ -97,5 +97,5 @@
  */
 #if UseInstalled
-              MKDIRHIER = BourneShell BinDir/mkdirhier
+              MKDIRHIER = mkdirhier
 #endif
 
@@ -193,12 +193,4 @@
  */
 /*
- *	use the same trick X11R5 does for defining rules for installed libs
- */
-#ifdef UseInstalled
-#define _Use(a,b) a
-#else
-#define _Use(a,b) b
-#endif
-/*
  *	Temporary directory used during build process before the include
  *	files are installed.  This is just a place where symbolic links are
@@ -225,5 +217,5 @@
  */
 #ifndef XVIncludeDirName
-#define XVIncludeDirName /include
+#define XVIncludeDirName include
 #endif
                  INCDIR = XVIncludeDirName
@@ -357,8 +349,8 @@
 #if SystemV4
              SYSV_CLIENT_LIB = -lintl -ldl
-	     XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
+             XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
 #else
              SYSV_CLIENT_LIB =
-	     XVCLIENTSYSDEFINES = -DSUNOS41
+             XVCLIENTSYSDEFINES = -DSUNOS41
 #endif
 
@@ -372,14 +364,14 @@
 
 #if XvI18nLevel == 4
-	XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5
-	XVCLIENTMISCLIB = -lw
-	XVCLIENTINCLUDES = -I$(OPENWINHOME)/include
+        XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5
+        XVCLIENTMISCLIB = -lw
+        XVCLIENTINCLUDES = -I$(OPENWINHOME)/include
 #else
-	XVCLIENTI18NDEFINES = -DOW_I18N_L3
-	XVCLIENTMISCLIB = 
-	XVCLIENTINCLUDES = 
+        XVCLIENTI18NDEFINES = -DOW_I18N_L3
+        XVCLIENTMISCLIB = 
+        XVCLIENTINCLUDES = 
 #endif
 
-	XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
+        XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
 
 /*