diff -ruN transfig.3.2.5-alpha6/fig2dev/Imakefile transfig.3.2.5-alpha6-patched/fig2dev/Imakefile
--- transfig.3.2.5-alpha6/fig2dev/Imakefile	2005-08-18 12:31:05.000000000 -0400
+++ transfig.3.2.5-alpha6-patched/fig2dev/Imakefile	2006-02-27 12:57:04.000000000 -0500
@@ -34,7 +34,7 @@
 XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled
 XCOMM and installed xfig.
 
-XFIGLIBDIR =	/usr/local/lib/X11/xfig
+XFIGLIBDIR =	$(PREFIX)/share/xfig
 
 XCOMM ******
 XCOMM If your system doesn't have the strerror() function (has sys_errlist) then
@@ -74,9 +74,9 @@
 XCOMM file are in different places
 
 #ifdef USEPNG
-PNGLIBDIR = $(USRLIBDIR)
+PNGLIBDIR = $(PREFIX)/lib
 ZLIBDIR = $(USRLIBDIR)
-PNGINC = -I/usr/include/X11
+PNGINC = -I$(PREFIX)/include
 #endif
 
 XCOMM ****************
@@ -91,8 +91,8 @@
 #define USEXPM
 
 #ifdef USEXPM
-XPMLIBDIR = $(USRLIBDIR)
-XPMINC = -I/usr/include/X11
+XPMLIBDIR = @X11_BASE_DIR@/lib
+XPMINC = -I@X11_BASE_DIR/include/X11
 #endif
 
 XCOMM ****************
@@ -141,7 +141,7 @@
 
 #ifdef I18N
 I18N_DEFS = -DI18N 
-FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
+FIG2DEV_LIBDIR = @PREFIX@/lib/fig2dev
 I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=$(FIG2DEV_LIBDIR) -DFIG2DEV_LIBDIR_STR=\\\"$(FIG2DEV_LIBDIR)\\\"
 
 #endif /* I18N */
diff -ruN transfig.3.2.5-alpha6/fig2dev/dev/Imakefile transfig.3.2.5-alpha6-patched/fig2dev/dev/Imakefile
--- transfig.3.2.5-alpha6/fig2dev/dev/Imakefile	2003-09-30 11:48:08.000000000 -0400
+++ transfig.3.2.5-alpha6-patched/fig2dev/dev/Imakefile	2006-02-27 12:57:04.000000000 -0500
@@ -50,6 +50,8 @@
 NormalLibraryTarget($(LIB),$(LIBOBJS))
 DependTarget()
 
+FIG2DEV_LIBDIR = $(PREFIX)/lib/fig2dev
+
 #ifdef I18N
 install::
 	InstallNonExecFile(japanese.ps,FIG2DEV_LIBDIR)
diff -ruN transfig.3.2.5-alpha6/transfig/Imakefile transfig.3.2.5-alpha6-patched/transfig/Imakefile
--- transfig.3.2.5-alpha6/transfig/Imakefile	2003-03-25 15:52:37.000000000 -0500
+++ transfig.3.2.5-alpha6-patched/transfig/Imakefile	2006-02-27 12:57:04.000000000 -0500
@@ -32,7 +32,7 @@
 XCOMM \\usepackage{} command for LaTeX2e. 
 XCOMM The default is to use \\documentstyle{} for LaTeX209.
 
-XCOMM USELATEX2E = -DLATEX2E
+USELATEX2E = -DLATEX2E
 
 XCOMM ******* DON'T CHANGE ANYTHING BELOW THIS POINT *******