1--- fig2dev/Imakefile.orig Thu Mar 25 22:39:10 2004
2+++ fig2dev/Imakefile Thu Mar 25 22:41:01 2004
3@@ -16,17 +16,23 @@
4 XCOMM party to do so, with the only requirement being that this copyright
5 XCOMM notice remain intact.
6
7+BINDIR = __PREFIX/bin
8+DESTDIR = __DESTROOT
9+MKDIRHIER = mkdirhier
10+MANDIR = __PREFIX/share/man/$(MANSUFFIX)
11+INSTALLFLAGS = -c
12+
13 XCOMM ******
14 XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled
15 XCOMM and installed xfig.
16
17-XFIGLIBDIR = /usr/local/lib/X11/xfig
18+XFIGLIBDIR = __PREFIX/lib/xfig
19
20 XCOMM ******
21 XCOMM If your system has the strerror() function (doesn't have sys_errlist) then
22 XCOMM comment out NEED_STRERROR with an XCOMM comment.
23
24-NEED_STRERROR = -DNEED_STRERROR
25+XCOMM NEED_STRERROR = -DNEED_STRERROR
26
27 XCOMM The following probably only applies to Windows 9x/NT:
28 XCOMM If your system can open files in text and binary modes and has the
29@@ -39,7 +45,7 @@
30 XCOMM inline functions. With the "INLINE" keyword, you should notice that
31 XCOMM the display will be a bit faster in complex figures
32
33-XCOMM USEINLINE = -DUSE_INLINE
34+USEINLINE = -DUSE_INLINE
35
36 XCOMM ****************
37 XCOMM Change RGB if necessary, to point to your rgb.txt color database
38@@ -60,8 +66,8 @@
39 XCOMM are in different places
40
41 #ifdef USEPNG
42-PNGLIBDIR = $(USRLIBDIR)
43-PNGINC = -I/usr/include/X11
44+PNGLIBDIR = __PREFIX_PNG/lib
45+PNGINC = -I__PREFIX_PNG/include
46 #endif
47
48 XCOMM ****************
49@@ -73,7 +79,7 @@
50 XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
51 XCOMM
52
53-XCOMM #define USEXPM
54+XCOMM #define USEXPM
55
56 #ifdef USEXPM
57 XPMLIBDIR = $(USRLIBDIR)
58@@ -126,7 +132,7 @@
59
60 #ifdef I18N
61 I18N_DEFS = -DI18N
62-FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
63+FIG2DEV_LIBDIR = __PREFIX/lib/fig2dev
64 I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=\\\"$(FIG2DEV_LIBDIR)\\\"
65
66 install::
67@@ -177,7 +183,7 @@
68
69 IMAKE_DEFINES = $(DUSEPNG) $(DUSEXPM)
70
71-DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(XPMINC) $(DDNFSS) $(DDA4) \
72+DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(PNGINC) $(XPMINC) $(DDNFSS) $(DDA4) \
73 $(DDLATEX2E_GRAPHICS) $(DDEPSFIG) $(DDIBMGEC) $(DDDVIPS) $(I18N_DEV_DEFS)
74
75 #define IHaveSubdirs