--- config/XView.tmpl.orig	1994-06-27 04:10:00.000000000 +0200
+++ config/XView.tmpl	2003-12-30 01:49:57.000000000 +0100
@@ -2,10 +2,10 @@
 #define XViewTmpl YES
 
 #include <XView.cf>
-/**/###########################################################################
-/**/# @(#)XView.tmpl	1.15 12 May 1993 SMI
-/**/# XView.tmpl for XView release 3.2.  Template to add additional config
-/**/# rules to those supplied with X Version 11 release 5.
+XCOMM ##########################################################################
+XCOMM @(#)XView.tmpl	1.15 12 May 1993 SMI
+XCOMM XView.tmpl for XView release 3.2.  Template to add additional config
+XCOMM rules to those supplied with X Version 11 release 5.
 
 /***************************************************************************/
 /***************************************************************************/
@@ -96,7 +96,7 @@
  *      Work around small conflict with Project.tmpl file
  */
 #if UseInstalled
-              MKDIRHIER = BourneShell BinDir/mkdirhier
+              MKDIRHIER = mkdir -p
 #endif
 
 #if OsHasLocale
@@ -194,6 +194,7 @@
 /*
  *	use the same trick X11R5 does for defining rules for installed libs
  */
+#undef _Use
 #ifdef UseInstalled
 #define _Use(a,b) a
 #else
@@ -224,7 +225,7 @@
  *	afterwards.
  */
 #ifndef XVIncludeDirName
-#define XVIncludeDirName /include
+#define XVIncludeDirName include
 #endif
                  INCDIR = XVIncludeDirName
 /*
@@ -356,10 +357,10 @@
 
 #if SystemV4
              SYSV_CLIENT_LIB = -lintl -ldl
-	     XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
+             XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
 #else
              SYSV_CLIENT_LIB =
-	     XVCLIENTSYSDEFINES = -DSUNOS41
+             XVCLIENTSYSDEFINES = -DSUNOS41
 #endif
 
 /*
@@ -371,16 +372,16 @@
  */
 
 #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)
 
 /*
  *	Define libraries for XView clients
