--- Imakefile.orig	Fri Jan 14 12:25:09 2000
+++ Imakefile	Sat Jan 22 01:20:28 2000
@@ -40,8 +40,8 @@
 
 #ifdef USEJPEG
 #ifdef USEINSTALLEDJPEG
-JPEGLIBDIR = /usr/local/lib
-JPEGINCDIR = /usr/include/X11
+JPEGLIBDIR = %%LOCALBASE%%/lib
+JPEGINCDIR = %%LOCALBASE%%/include
 #else
 JPEGLIBDIR = ../jpeg
 JPEGINCDIR = $(JPEGLIBDIR)
@@ -59,18 +59,18 @@
 XCOMM Change XPMLIBDIR if necessary to point to the xpm library (libXpm)
 XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
 
-XCOMM #define USEXPM
-XCOMM #define USEXPM_ICON
+#define USEXPM
+#define USEXPM_ICON
 
 #ifdef USEXPM
 XPMLIBDIR = $(USRLIBDIR)
-XPMINC = -I/usr/include/X11
+XPMINC = -I$(INCDIR)/X11
 #endif
 
 XCOMM Uncomment the following definiton if you want to use the small icons
 XCOMM for the panel buttons.  Use this if you have a 800x600 or smaller screen.
 
-XCOMM #define USESMALLICONS
+#define USESMALLICONS
 
 XCOMM Uncomment the following definition for XAW3D if you want to use
 XCOMM the 3d Athena Widget Set (highly recommended!)
@@ -99,7 +99,7 @@
 XCOMM Uncomment the next line if you want use Japanese (i18n) on xfig.
 XCOMM If your setlocale() dosen't support the locale, you should
 XCOMM add -DSETLOCALE to I18N_DEFS.
-XCOMM #define I18N
+#define I18N
 
 XCOMM If using an input tablet uncomment the following
 
@@ -110,7 +110,7 @@
 XCOMM inline functions. With the "INLINE" keyword, you should notice that
 XCOMM the display will be a bit faster in complex figures
 
-XCOMM USEINLINE = -DUSE_INLINE
+USEINLINE = -DUSE_INLINE
 
 XCOMM use (and change) the following if you want the multi-key data base file
 XCOMM somewhere other than the standard X11 library directory
@@ -189,7 +189,7 @@
 #endif /* USEJPEG */
 
 #ifdef I18N
-I18N_DEFS = -DI18N -DSETLOCALE
+I18N_DEFS = -DI18N #-DSETLOCALE
 I18N_SRC = w_i18n.c
 I18N_OBJ = w_i18n.o
 #endif