--- Imakefile.dist	Thu Feb 20 15:00:08 2003
+++ Imakefile	Thu Feb 20 16:42:03 2003
@@ -2,13 +2,13 @@
 
 /* Fairly important stuff */
 
-#define OptimizationLevel -O4
+#define OptimizationLevel -O2
 #define DoWall NO
 
-#define BuildShared YES
+#define BuildShared NO
 #define StaticLink YES
 
-#define BuildGL YES
+#define BuildGL NO
 
 
 /* Less Important or System Specific */
@@ -32,23 +32,23 @@
 
 /* Out in the Tall Weeds */
 
-#define InstallNonstandard NO
-#define XFormsNonstandardInstallDir /usr/local
+#define InstallNonstandard YES
+#define XFormsNonstandardInstallDir @l_prefix@
 
-#define NonstandardXpm NO
+#define NonstandardXpm YES
 
-#define XpmIncLoc /usr/local/include
-#define XpmLibLoc /usr/local/lib
+#define XpmIncLoc @l_prefix@/include/X11
+#define XpmLibLoc @l_prefix@/lib
 
-#define NonstandardTiff NO
+#define NonstandardTiff YES
 
-#define TiffIncLoc /usr/local/include
-#define TiffLibLoc /usr/local/lib
+#define TiffIncLoc @l_prefix@/include
+#define TiffLibLoc @l_prefix@/lib
 
-#define NonstandardJpeg NO
+#define NonstandardJpeg YES
 
-#define JpegIncLoc /usr/local/include
-#define JpegLibLoc /usr/local/lib
+#define JpegIncLoc @l_prefix@/include
+#define JpegLibLoc @l_prefix@/lib
 
 ######################################################################
 #                                                                    #
--- demos/Imakefile.dist	Thu Feb 20 15:26:40 2003
+++ demos/Imakefile	Thu Feb 20 16:42:09 2003
@@ -154,7 +154,7 @@
 		  -I.
 
 DEPEND_DEFINES	= \
-		  -I/usr/local/include
+		  -I@l_prefix@/include
 
 EXTRA_LIBRARIES	= \
 		  $(STATIC) \
@@ -176,7 +176,7 @@
 
 #if Optimize
 IMAKE_OPTIMIZE  = -DDoOptimize=1
-OPTIMIZER	= -O4
+OPTIMIZER	= -O2
 #else
 OPTIMIZER	=
 #endif
--- fd2ps/Imakefile.dist	Thu Feb 20 15:26:40 2003
+++ fd2ps/Imakefile	Thu Feb 20 16:41:52 2003
@@ -64,7 +64,7 @@
 		  -I.
 
 DEPEND_DEFINES	= \
-		  -I/usr/local/include
+		  -I@l_prefix@/include
 
 EXTRA_LIBRARIES	= \
 		  $(STATIC) \
@@ -83,7 +83,7 @@
 CDEBUGFLAGS	= -g $(OPTIMIZER)
 #if Optimize
 IMAKE_OPTIMIZE  = -DDoOptimize=1
-OPTIMIZER	= -O4
+OPTIMIZER	= -O2
 #else
 OPTIMIZER	=
 #endif
--- fdesign/Imakefile.dist	Thu Feb 20 15:26:40 2003
+++ fdesign/Imakefile	Thu Feb 20 15:27:27 2003
@@ -99,7 +99,7 @@
 		  -I.
 
 DEPEND_DEFINES	= \
-		  -I/usr/local/include
+		  -I@l_prefix@/include
 
 
 EXTRA_LIBRARIES	= \
--- gl/Imakefile.dist	Thu Feb 20 15:26:40 2003
+++ gl/Imakefile	Thu Feb 20 15:28:52 2003
@@ -44,7 +44,7 @@
 REQUIREDLIBS	= \
 		  $(LDPRELIB) \
 		  $(XLIB) \
-		  -L/usr/local/lib \
+		  -L@l_prefix@/lib \
 		  -L../lib -lforms \
 		  -lGL \
 		  $(LGCC)
@@ -56,7 +56,7 @@
 		  -I.
 
 DEPEND_DEFINES	= \
-		  -I/usr/local/include
+		  -I@l_prefix@/include
 
 EXTRA_DEFINES	= \
 		  -DMAKING_FORMS \
--- image/Imakefile.dist	Thu Feb 20 15:41:45 2003
+++ image/Imakefile	Thu Feb 20 15:28:08 2003
@@ -88,7 +88,7 @@
 		  -I.
 
 DEPEND_DEFINES	= \
-		  -I/usr/local/include
+		  -I@l_prefix@/include
 
 EXTRA_DEFINES	= \
 		  $(HAVE_STRERROR )
@@ -121,7 +121,8 @@
 REQUIREDLIBS	= \
 		  $(LDPRELIB) \
 		  $(XLIB) \
-		  -L/usr/local/lib \
+		  $(LDFLAGS) \
+		  -L@l_prefix@/lib \
 		  -L../lib -lforms \
 		  $(JPEGLIBDIR) -ljpeg \
 		  $(TIFFLIBDIR) -ltiff \
--- lib/Imakefile.dist	Thu Feb 20 15:02:58 2003
+++ lib/Imakefile	Thu Feb 20 15:03:08 2003
@@ -128,7 +128,7 @@
 		  -Ifd
 
 DEPEND_DEFINES	= \
-		  -I/usr/local/include
+		  -I@l_prefix@/include
 
 #if !BuildGL
 NO_GL		= -DNO_GL