--- Imakefile.orig	Thu Aug 17 20:24:24 1995
+++ Imakefile	Sun Sep 24 12:52:35 1995
@@ -42,10 +42,10 @@
 XCOMM You need XPM version 3.4c or newer.  This is available from ftp.x.org
 XCOMM   in /contrib/libraries.
 
-XCOMM XPMDEFINES = -DUSE_XPM -DUSE_XPM_ICON
-XCOMM XPMLIBDIR = /usr/lib
-XCOMM XPMINCDIR = /usr/include/X11
-XCOMM XPMLIB = -L$(XPMLIBDIR) -lXpm
+XPMDEFINES = -DUSE_XPM -DUSE_XPM_ICON
+XPMLIBDIR = $(USRLIBDIR)
+XPMINCDIR = $(INCROOT)/X11
+XPMLIB = -L$(XPMLIBDIR) -lXpm
 
 XCOMM If you have installed the jpeg library on your system, uncomment the
 XCOMM USEINSTALLEDJPEG variable, change the JPEGLIBDIR variable to the directory
@@ -56,11 +56,11 @@
 XCOMM set JPEGLIBDIR after the #else to the directory where you have the source
 XCOMM for jpeg.
 
-XCOMM #define USEINSTALLEDJPEG
+#define USEINSTALLEDJPEG
 
 #ifdef USEINSTALLEDJPEG
 JPEGLIBDIR = /usr/local/lib
-JPEGINCDIR = /usr/include/X11
+JPEGINCDIR = /usr/local/include
 #else
 JPEGLIBDIR = ../jpeg
 JPEGINCDIR = $(JPEGLIBDIR)
@@ -147,7 +147,7 @@
 
 XCOMM *** You shouldn't have to change anything below this point. ***
 
-DEFINES =             $(STRDEFINES) -DGSBIT $(XPMDEFINES)
+DEFINES =             $(STRDEFINES) $(XPMDEFINES)
 
 XFIGSRC =	d_arc.c d_arcbox.c d_box.c d_ellipse.c d_picobj.c \
 		d_intspline.c d_line.c d_regpoly.c d_spline.c d_text.c \