diff -Naur olvwm4pl1-Linux.orig/Imakefile olvwm4pl1-Linux/Imakefile
--- olvwm4pl1-Linux.orig/Imakefile	1995-04-24 07:53:55.000000000 +0900
+++ olvwm4pl1-Linux/Imakefile	2003-08-23 10:13:30.000000000 +0900
@@ -48,7 +48,8 @@
 /**/#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DIDENT
 
 /**/# For a generic Solaris 2.x system, I'd suggest
-MORECCFLAGS=-I/usr/X11R6/include/X11 -I/usr/include/bsd -include /usr/include/bsd/bsd.h -DOW_I18N_L3 -DIDENT -DXPM -DSHAPE -DXLIB_ILLEGAL_ACCESS -DMAXPID=32768 
+/**/#MORECCFLAGS=-I/usr/X11R6/include/X11 -I/usr/include/bsd -include /usr/include/bsd/bsd.h -DOW_I18N_L3 -DIDENT -DXPM -DSHAPE -DXLIB_ILLEGAL_ACCESS -DMAXPID=32768 
+MORECCFLAGS=-I/usr/X11R6/include/X11 -DOW_I18N_L3 -DIDENT -DXPM -DSHAPE -DXLIB_ILLEGAL_ACCESS -DMAXPID=32768 
 
 /**/#
 /**/# Set MORELDFLAGS to any link options you want.  Be sure to add -lxpm if you
@@ -57,7 +58,8 @@
 /**/#MORELDFLAGS=-L${OPENWINHOME}/lib
 /**/#
 /**/# For Solaris 2.x, I'd suggest
-MORELDFLAGS=-lbsd -lXpm
+/**/MORELDFLAGS=-lbsd -lXpm
+MORELDFLAGS=-lXpm
 
 
 /**/# No more changes needed
@@ -115,24 +117,21 @@
 	${HEADERS} ${BITMAPS} ${SRCS} \
 	${MISC} ${INFOFILES} ${MANPAGES} ${SCRIPTS}
 
-ComplexProgramTarget(olvwm)
-
-#if NeedMenuFile
-InstallNonExecList($(MISC),$(LIBRARY_DEST))
-#endif
-
-parse.c: parse.l
-	lex -t parse.l > parse.c
+LexFile(parse)
 
-olvwmrc.c: olvwmrc.y
-	yacc olvwmrc.y
-	mv y.tab.c olvwmrc.c
+YaccFileNoFlags(olvwmrc)
 
 olvwmrc.o: parse.c olvwmrc.c
 
 version.c: ${SRCS} ${HEADERS}
 	@echo '#ident "@(#)olvwm version compiled '`date`'"' > version.c
 
+ComplexProgramTarget(olvwm)
+
+#if NeedMenuFile
+InstallNonExecList($(MISC),$(LIBRARY_DEST))
+#endif
+
 clean::
 	/bin/rm -f parse.c olvwmrc.c version.c
 
diff -Naur olvwm4pl1-Linux.orig/olvwm.man olvwm4pl1-Linux/olvwm.man
--- olvwm4pl1-Linux.orig/olvwm.man	1994-01-25 07:18:17.000000000 +0900
+++ olvwm4pl1-Linux/olvwm.man	2003-08-23 10:49:04.000000000 +0900
@@ -255,7 +255,7 @@
 .sp
 Programs                 MENU
 Programs		COLUMNS 2
-        </usr/openwin/include/X11/bitmaps/terminal>  DEFAULT cmdtool
+        </usr/X11R6/include/X11/bitmaps/terminal>  DEFAULT cmdtool
         "Text Editor"           textedit
         Mail                    mailtool
         "File Manager"          filemgr
diff -Naur olvwm4pl1-Linux.orig/pixmap.c olvwm4pl1-Linux/pixmap.c
--- olvwm4pl1-Linux.orig/pixmap.c	1995-04-24 04:22:17.000000000 +0900
+++ olvwm4pl1-Linux/pixmap.c	2003-08-23 10:49:49.000000000 +0900
@@ -479,7 +479,7 @@
         int     i = 0;;
 
         if ((owHome = getenv("OPENWINHOME")) == NULL)
-                owHome = "/usr/openwin";
+                owHome = "/usr/X11R6";
 
         bitmapSearchPath = (char **)MemAlloc(4 * sizeof(char *));
 
diff -Naur olvwm4pl1-Linux.orig/screen.c olvwm4pl1-Linux/screen.c
--- olvwm4pl1-Linux.orig/screen.c	1995-04-24 04:22:17.000000000 +0900
+++ olvwm4pl1-Linux/screen.c	2003-08-23 10:50:29.000000000 +0900
@@ -536,7 +536,7 @@
 	int     i = 0;;
 
 	if ((owHome = getenv("OPENWINHOME")) == NULL)
-		owHome = "/usr/openwin";
+		owHome = "/usr/X11R6";
 
 	bitmapSearchPath = (char **)MemAlloc(4 * sizeof(char *));
 
diff -Naur olvwm4pl1-Linux.orig/usermenu.c olvwm4pl1-Linux/usermenu.c
--- olvwm4pl1-Linux.orig/usermenu.c	1994-01-14 06:36:21.000000000 +0900
+++ olvwm4pl1-Linux/usermenu.c	2003-08-23 10:51:06.000000000 +0900
@@ -884,7 +884,7 @@
 		home = ".";
  
 	if ((owHome = getenv("OPENWINHOME")) == NULL)
-		owHome = "/usr/openwin";
+		owHome = "/usr/X11R6";
  
 	menuSearchPath = (char **)MemAlloc(NUM_SEARCH_PATH*sizeof(char *));
  
@@ -914,8 +914,8 @@
 	sprintf(buf, "%s/lib/%%s", owHome);
 	menuSearchPath[i++] = MemNewString(buf);
 
-	/* /usr/openwin/lib/<menufile> */
-	menuSearchPath[i++] = MemNewString("/usr/openwin/lib/%s");
+	/* /usr/X11R6/lib/<menufile> */
+	menuSearchPath[i++] = MemNewString("/usr/X11R6/lib/%s");
 
 	menuSearchPath[i] = (char *)NULL;