--- configure.h.orig	Fri Feb  6 07:16:26 1998
+++ configure.h	Wed Mar 11 15:25:30 1998
@@ -33,7 +33,7 @@
 #ifdef MlvwmLibDir
     MLVWMLIBDIR = MlvwmLibDir
 #else
-    MLVWMLIBDIR = $(USRLIBDIR)/mlvwm
+    MLVWMLIBDIR = $(USRLIBDIR)/X11/mlvwm
 #endif
 
 #ifndef HasLocale
@@ -69,12 +69,12 @@
 #endif
 
 XCOMM 
-      CDEBUGFLAGS = -g -Wall -Wshadow
+      CDEBUGFLAGS += -Wall -Wshadow
 XCOMM            CDEBUGFLAGS = -O2 -Wall
 XCOMM            CDEBUGFLAGS = -g -Wall
 XCOMM            CDEBUGFLAGS = -g
 
-ICONPATH = /usr/X11R6/include/pixmaps
+ICONPATH = /usr/X11R6/include/X11/pixmaps
 
 MLVWMDEFINES = $(Locale_DEFINES) $(COMPATIBLE)
 MLVWMLIBRARIES = $(Locale_LIBRARIES)