Lines 1-6
Link Here
|
1 |
--- fig2dev/Imakefile.orig Fri Dec 20 02:33:44 2002 |
1 |
--- fig2dev/Imakefile.orig Thu Oct 27 09:56:02 2005 |
2 |
+++ fig2dev/Imakefile Wed Jan 8 08:36:50 2003 |
2 |
+++ fig2dev/Imakefile |
3 |
@@ -20,13 +20,13 @@ |
3 |
@@ -34,7 +34,7 @@ |
4 |
XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled |
4 |
XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled |
5 |
XCOMM and installed xfig. |
5 |
XCOMM and installed xfig. |
6 |
|
6 |
|
Lines 8-22
Link Here
|
8 |
+XFIGLIBDIR = $(LIBDIR)/xfig |
8 |
+XFIGLIBDIR = $(LIBDIR)/xfig |
9 |
|
9 |
|
10 |
XCOMM ****** |
10 |
XCOMM ****** |
11 |
XCOMM If your system has the strerror() function (doesn't have sys_errlist) then |
11 |
XCOMM If your system doesn't have the strerror() function (has sys_errlist) then |
12 |
XCOMM comment out NEED_STRERROR with an XCOMM comment. |
12 |
@@ -53,7 +53,7 @@ |
13 |
|
|
|
14 |
-NEED_STRERROR = -DNEED_STRERROR |
15 |
+XCOMM NEED_STRERROR = -DNEED_STRERROR |
16 |
|
17 |
XCOMM The following probably only applies to Windows 9x/NT: |
18 |
XCOMM If your system can open files in text and binary modes and has the |
19 |
@@ -39,7 +39,7 @@ |
20 |
XCOMM inline functions. With the "INLINE" keyword, you should notice that |
13 |
XCOMM inline functions. With the "INLINE" keyword, you should notice that |
21 |
XCOMM the display will be a bit faster in complex figures |
14 |
XCOMM the display will be a bit faster in complex figures |
22 |
|
15 |
|
Lines 25-47
Link Here
|
25 |
|
18 |
|
26 |
XCOMM **************** |
19 |
XCOMM **************** |
27 |
XCOMM Change RGB if necessary, to point to your rgb.txt color database |
20 |
XCOMM Change RGB if necessary, to point to your rgb.txt color database |
28 |
@@ -60,8 +60,8 @@ |
21 |
@@ -74,9 +74,9 @@ |
29 |
XCOMM are in different places |
22 |
XCOMM file are in different places |
30 |
|
23 |
|
31 |
#ifdef USEPNG |
24 |
#ifdef USEPNG |
32 |
-PNGLIBDIR = $(USRLIBDIR) |
25 |
-PNGLIBDIR = $(USRLIBDIR) |
33 |
-PNGINC = -I/usr/include/X11 |
|
|
34 |
+PNGLIBDIR = ${LOCALBASE}/lib |
26 |
+PNGLIBDIR = ${LOCALBASE}/lib |
|
|
27 |
ZLIBDIR = $(USRLIBDIR) |
28 |
-PNGINC = -I/usr/include/X11 |
35 |
+PNGINC = -I${LOCALBASE}/include/libpng |
29 |
+PNGINC = -I${LOCALBASE}/include/libpng |
36 |
#endif |
30 |
#endif |
37 |
|
31 |
|
38 |
XCOMM **************** |
32 |
XCOMM **************** |
39 |
@@ -73,11 +73,11 @@ |
33 |
@@ -92,7 +92,7 @@ |
40 |
XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h) |
|
|
41 |
XCOMM |
42 |
|
43 |
-XCOMM #define USEXPM |
44 |
+#define USEXPM |
45 |
|
34 |
|
46 |
#ifdef USEXPM |
35 |
#ifdef USEXPM |
47 |
XPMLIBDIR = $(USRLIBDIR) |
36 |
XPMLIBDIR = $(USRLIBDIR) |
Lines 50-93
Link Here
|
50 |
#endif |
39 |
#endif |
51 |
|
40 |
|
52 |
XCOMM **************** |
41 |
XCOMM **************** |
53 |
@@ -126,23 +126,23 @@ |
42 |
@@ -141,7 +141,7 @@ |
54 |
|
43 |
|
55 |
#ifdef I18N |
44 |
#ifdef I18N |
56 |
I18N_DEFS = -DI18N |
45 |
I18N_DEFS = -DI18N |
57 |
-FIG2DEV_LIBDIR = /usr/local/lib/fig2dev |
46 |
-FIG2DEV_LIBDIR = /usr/local/lib/fig2dev |
58 |
+FIG2DEV_LIBDIR = $(LIBDIR)/fig2dev |
47 |
+FIG2DEV_LIBDIR = $(LIBDIR)/fig2dev |
59 |
I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=\\\"$(FIG2DEV_LIBDIR)\\\" |
48 |
I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=$(FIG2DEV_LIBDIR) -DFIG2DEV_LIBDIR_STR=\\\"$(FIG2DEV_LIBDIR)\\\" |
60 |
|
|
|
61 |
install:: |
62 |
[ -d $(DESTDIR)$(FIG2DEV_LIBDIR) ] || mkdir $(DESTDIR)$(FIG2DEV_LIBDIR) |
63 |
- $(INSTALL) -c dev/japanese.ps $(DESTDIR)$(FIG2DEV_LIBDIR) |
64 |
+ $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) dev/japanese.ps $(DESTDIR)$(FIG2DEV_LIBDIR) |
65 |
( cd $(DESTDIR)$(FIG2DEV_LIBDIR); \ |
66 |
rm -f ja.ps ja_JP.ps ja_JP.ujis.ps ja_JP.eucJP.ps ja_JP.EUC.ps; \ |
67 |
$(LN) japanese.ps ja.ps; $(LN) japanese.ps ja_JP.ps; \ |
68 |
$(LN) japanese.ps ja_JP.ujis.ps; $(LN) japanese.ps ja_JP.eucJP.ps; \ |
69 |
$(LN) japanese.ps ja_JP.EUC.ps ) |
70 |
- $(INSTALL) -c dev/korean.ps $(DESTDIR)$(FIG2DEV_LIBDIR) |
71 |
+ $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) dev/korean.ps $(DESTDIR)$(FIG2DEV_LIBDIR) |
72 |
( cd $(DESTDIR)$(FIG2DEV_LIBDIR); \ |
73 |
rm -f ko.ps ko_KR.ps ko_KR.eucKR.ps ko_KR.EUC.ps; \ |
74 |
$(LN) korean.ps ko.ps; $(LN) korean.ps ko_KR.ps; \ |
75 |
$(LN) korean.ps ko_KR.eucKR.ps; $(LN) korean.ps ko_KR.EUC.ps ) |
76 |
- $(INSTALL) -c dev/cs_CZ.ps $(DESTDIR)$(FIG2DEV_LIBDIR) |
77 |
+ $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) dev/cs_CZ.ps $(DESTDIR)$(FIG2DEV_LIBDIR) |
78 |
( cd $(DESTDIR)$(FIG2DEV_LIBDIR); \ |
79 |
rm -f hr_HR.ps hu_HU.ps pl_PL.ps ro_RO.ps sk_SK.ps sl_SI.ps; \ |
80 |
$(LN) cs_CZ.ps hr_HR.ps; $(LN) cs_CZ.ps hu_HU.ps; \ |
81 |
@@ -177,7 +177,7 @@ |
82 |
|
83 |
IMAKE_DEFINES = $(DUSEPNG) $(DUSEXPM) |
84 |
|
85 |
-DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(XPMINC) $(DDNFSS) $(DDA4) \ |
86 |
+DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(PNGINC) $(XPMINC) $(DDNFSS) $(DDA4) \ |
87 |
$(DDLATEX2E_GRAPHICS) $(DDEPSFIG) $(DDIBMGEC) $(DDDVIPS) $(I18N_DEV_DEFS) |
88 |
|
49 |
|
89 |
#define IHaveSubdirs |
50 |
#endif /* I18N */ |
90 |
@@ -233,7 +233,7 @@ |
51 |
@@ -229,7 +229,7 @@ |
91 |
else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR)/bitmaps ); fi ; \ |
52 |
else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR)/bitmaps ); fi ; \ |
92 |
echo Copying bitmap files for tk to $(DESTDIR)$(XFIGLIBDIR)/bitmaps ; \ |
53 |
echo Copying bitmap files for tk to $(DESTDIR)$(XFIGLIBDIR)/bitmaps ; \ |
93 |
for f in * ; do \ |
54 |
for f in * ; do \ |