--- fig2dev/Imakefile.orig	Thu Mar 25 22:39:10 2004
+++ fig2dev/Imakefile	Thu Mar 25 22:41:01 2004
@@ -16,17 +16,23 @@
 XCOMM party to do so, with the only requirement being that this copyright 
 XCOMM notice remain intact.
 
+BINDIR = __PREFIX/bin
+DESTDIR = __DESTROOT
+MKDIRHIER = mkdirhier
+MANDIR = __PREFIX/share/man/$(MANSUFFIX)
+INSTALLFLAGS = -c
+
 XCOMM ******
 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/lib/xfig
 
 XCOMM ******
 XCOMM If your system has the strerror() function (doesn't have sys_errlist) then
 XCOMM comment out NEED_STRERROR with an XCOMM comment.
 
-NEED_STRERROR = -DNEED_STRERROR
+XCOMM NEED_STRERROR = -DNEED_STRERROR
 
 XCOMM The following probably only applies to Windows 9x/NT:
 XCOMM If your system can open files in text and binary modes and has the
@@ -39,7 +45,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 ****************
 XCOMM Change RGB if necessary, to point to your rgb.txt color database
@@ -60,8 +66,8 @@
 XCOMM are in different places
 
 #ifdef USEPNG
-PNGLIBDIR = $(USRLIBDIR)
-PNGINC = -I/usr/include/X11
+PNGLIBDIR = __PREFIX_PNG/lib
+PNGINC = -I__PREFIX_PNG/include
 #endif
 
 XCOMM ****************
@@ -73,7 +79,7 @@
 XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
 XCOMM
 
-XCOMM #define USEXPM
+XCOMM #define USEXPM
 
 #ifdef USEXPM
 XPMLIBDIR = $(USRLIBDIR)
@@ -126,7 +132,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)\\\"
 
 install::
@@ -177,7 +183,7 @@
 
 IMAKE_DEFINES = $(DUSEPNG) $(DUSEXPM)
 
-DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(XPMINC) $(DDNFSS) $(DDA4) \
+DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(PNGINC) $(XPMINC) $(DDNFSS) $(DDA4) \
 		$(DDLATEX2E_GRAPHICS) $(DDEPSFIG) $(DDIBMGEC) $(DDDVIPS) $(I18N_DEV_DEFS)
 
 #define IHaveSubdirs