--- Imakefile.orig	Fri Feb 25 06:33:23 2005
+++ Imakefile	Fri Feb 25 06:33:51 2005
@@ -41,15 +41,17 @@
 XCOMM different tree than the "correct" tree that your X system expects. The usual
 XCOMM purpose of DESTDIR is to test an install process by installing in a benign area.
 
-XCOMM BINDIR = /usr/bin/X11
+BINDIR = __PREFIX/bin
+DESTDIR = __DESTROOT
+MKDIRHIER = mkdirhier
 XCOMM MKDIRHIER = /bin/sh /usr/bin/X11/mkdirhier
 XCOMM XAPPLOADDIR = /home/user/xfig
 
 XCOMM Redefine the following if your PNG library and/or include file
 XCOMM are in different places
 
-PNGLIBDIR = $(USRLIBDIR)
-PNGINC = -I/usr/local/include
+PNGLIBDIR = __PREFIX/lib
+PNGINC = -I__PREFIX/include
 
 XCOMM If don't want JPEG support, comment out the #define USEJPEG line
 XCOMM Uncomment the #define for USEJPEG if you want to be able to import
@@ -68,8 +70,8 @@
 
 #ifdef USEJPEG
 #ifdef USEINSTALLEDJPEG
-JPEGLIBDIR = /usr/local/lib
-JPEGINC = -I/usr/include/X11
+JPEGLIBDIR = __PREFIX/lib
+JPEGINC = -I__PREFIX/include
 #else
 JPEGLIBDIR = ../jpeg
 JPEGINC = -I$(JPEGLIBDIR)
@@ -105,7 +107,7 @@
 XCOMM Then be sure to change the XAW3DINC to point to the directory where your
 XCOMM 3D Athena widget headers are located
 
-XCOMM #define XAW3D
+#define XAW3D
 
 #ifdef XAW3D
 XAW3DINC = -I/usr/include/X11/Xaw3d
@@ -165,15 +167,15 @@
 XCOMM XFIGLIBDIR = /usr/local/lib/xfig
 
 XCOMM use this if you want the multi-key data base file in the standard X11 tree
-XFIGLIBDIR = $(LIBDIR)/xfig
+XFIGLIBDIR = __PREFIX/lib/xfig
 
 XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
 XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
-XFIGDOCDIR = /usr/share/doc/xfig
+XFIGDOCDIR = __PREFIX/share/doc/xfig
 
 XCOMM MANDIR tells where the standard man pages should go (no need to change it
 XCOMM if you want the man pages installed in the standard place on your system
-XCOMM MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
+MANDIR = __PREFIX/share/man/$(MANSUFFIX)
 
 XCOMM If your system doesn't have strstr undefine the following definition
 XCOMM HAVE_NO_NOSTRSTR = -DNOSTRSTR
