--- xfig.3.2.5b/Imakefile.bak	2009-09-04 14:02:04.000000000 -0400
+++ xfig.3.2.5b/Imakefile	2009-09-07 13:40:02.000000000 -0400
@@ -45,12 +45,12 @@
 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 XAPPLOADDIR = /home/user/xfig
+XAPPLOADDIR = /etc/X11/app-defaults
 
 XCOMM Comment out the following definition for XAW3D if you don't to want to use
 XCOMM the 3d Athena Widget Set
 
-#define XAW3D
+XCOMM #define XAW3D
 
 #ifdef XAW3D
 XAWLIB = -lXaw3d
@@ -64,6 +64,7 @@
 
 #ifdef XAW3D1_5E
     DUSEXAW3D = -DXAW3D -DXAW3D1_5E
+    XAWLIB = -lXaw3d
 #else
     XAW_SRC = w_menuentry.c SmeCascade.c SmeBSB.c SimpleMenu.c
     XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o
@@ -76,7 +77,7 @@
 XCOMM are in different places
 
 PNGLIBDIR = $(USRLIBDIR)
-PNGINC = -I/usr/local/include
+PNGINC = -I/usr/include
 ZLIBDIR = $(USRLIBDIR)
 
 XCOMM If don't want JPEG support, comment out the #define USEJPEG line
@@ -96,7 +97,7 @@
 
 #ifdef USEJPEG
     #ifdef USEINSTALLEDJPEG
-	JPEGLIBDIR = /usr/local/lib
+	JPEGLIBDIR = $(USRLIBDIR)
 	JPEGINC = -I/usr/include/X11
     #else
 	JPEGLIBDIR = ../jpeg
@@ -119,8 +120,8 @@
 #define USEXPM_ICON
 
 #ifdef USEXPM
-XPMLIBDIR = /usr/local/lib
-XPMINC = -I/usr/local/include/X11
+XPMLIBDIR = $(USRLIBDIR)
+XPMINC = -I/usr/include/X11
 #endif
 
 XCOMM Uncomment the following definiton if you want to use the small icons
@@ -172,13 +173,11 @@
 XFIGLIBDIR = $(LIBDIR)/xfig
 
 XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
-XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
-XFIGDOCDIR = /usr/local/xfig/doc
+XFIGDOCDIR = /usr/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
-MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
-XCOMM MANDIR = /usr/local/xfig/man
+MANDIR = /usr/share/man/man1
 
 XCOMM If your system doesn't have strstr undefine the following definition
 XCOMM HAVE_NO_NOSTRSTR = -DNOSTRSTR