1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
|
$NetBSD: patch-aa,v 1.6 2000/06/23 00:22:35 itohy Exp $
--- Imakefile.orig Fri Jan 14 12:25:09 2000
+++ Imakefile Thu Jun 23 07:28:52 2000
@@ -40,8 +40,8 @@
#ifdef USEJPEG
#ifdef USEINSTALLEDJPEG
-JPEGLIBDIR = /usr/local/lib
-JPEGINCDIR = /usr/include/X11
+JPEGLIBDIR = $(LOCALBASE)/lib
+JPEGINCDIR = $(LOCALBASE)/include
#else
JPEGLIBDIR = ../jpeg
JPEGINCDIR = $(JPEGLIBDIR)
@@ -59,12 +59,12 @@
XCOMM Change XPMLIBDIR if necessary to point to the xpm library (libXpm)
XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
-XCOMM #define USEXPM
-XCOMM #define USEXPM_ICON
+#define USEXPM
+#define USEXPM_ICON
#ifdef USEXPM
XPMLIBDIR = $(USRLIBDIR)
-XPMINC = -I/usr/include/X11
+XPMINC = -I$(INCDIR)/X11
#endif
XCOMM Uncomment the following definiton if you want to use the small icons
@@ -75,7 +75,7 @@
XCOMM Uncomment the following definition for XAW3D if you want to use
XCOMM the 3d Athena Widget Set (highly recommended!)
-#define XAW3D
+XCOMM #define XAW3D
#ifdef XAW3D
DUSEXAW3D = -DXAW3D
XAWLIB = -lXaw3d
@@ -99,7 +99,7 @@
XCOMM Uncomment the next line if you want use Japanese (i18n) on xfig.
XCOMM If your setlocale() dosen't support the locale, you should
XCOMM add -DSETLOCALE to I18N_DEFS.
-XCOMM #define I18N
+#define I18N
XCOMM If using an input tablet uncomment the following
@@ -110,7 +110,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 use (and change) the following if you want the multi-key data base file
XCOMM somewhere other than the standard X11 library directory
@@ -119,6 +119,8 @@
XCOMM use this if you want the multi-key data base file in the standard X11 tree
XFIGLIBDIR = $(LIBDIR)/xfig
+XFIGDOCDIR = $(PREFIX)/share/doc/xfig
+
XCOMM If your system doesn't have strstr undefine the following definition
XCOMM HAVE_NO_NOSTRSTR = -DNOSTRSTR
@@ -179,7 +181,7 @@
JPEGINC = -I$(JPEGINCDIR)
#ifdef USEINSTALLEDJPEG
-JPEGLIB = -L$(JPEGLIBDIR) -ljpeg
+JPEGLIB = -Wl,-R$(JPEGLIBDIR) -L$(JPEGLIBDIR) -ljpeg
#else
JPEGCONF = configure
JPEGLIB = $(JPEGLIBDIR)/libjpeg.a
@@ -194,7 +196,7 @@
I18N_OBJ = w_i18n.o
#endif
-DIR_DEFS= -DXFIGLIBDIR=\"$(XFIGLIBDIR)\"
+DIR_DEFS= -DXFIGLIBDIR=\"$(XFIGLIBDIR)\" -DXFIGDOCDIR=\"$(XFIGDOCDIR)\"
XCOMM location of Fig object libraries
OBJLIBDIR = $(XFIGLIBDIR)/Libraries
@@ -336,21 +338,22 @@
@make install.jhtml
#endif
@(cd Doc ; \
- echo Copying pdf and html files to $(XFIGLIBDIR) ; \
- $(INSTALL) -c xfig.html $(XFIGLIBDIR) ; \
- $(INSTALL) -c xfig-howto.pdf $(XFIGLIBDIR) ; \
- if [ -d $(XFIGLIBDIR)/html ]; then set +x; \
- else (set -x; $(MKDIRHIER) $(XFIGLIBDIR)/html ); fi ; \
+ echo Copying pdf and html files to $(XFIGDOCDIR) ; \
+ $(MKDIRHIER) $(XFIGDOCDIR) ; \
+ $(INSTALL) -c xfig.html $(XFIGDOCDIR) ; \
+ $(INSTALL) -c xfig-howto.pdf $(XFIGDOCDIR) ; \
+ if [ -d $(XFIGDOCDIR)/html ]; then set +x; \
+ else (set -x; $(MKDIRHIER) $(XFIGDOCDIR)/html ); fi ; \
(cd html ; \
for f in *.* ; do \
- $(INSTALL) -c $$f $(XFIGLIBDIR)/html ; \
+ $(INSTALL) -c $$f $(XFIGDOCDIR)/html ; \
done) ; \
echo " Copying image files for html" ; \
- if [ -d $(XFIGLIBDIR)/html/images ]; then set +x; \
- else (set -x; $(MKDIRHIER) $(XFIGLIBDIR)/html/images ); fi ; \
+ if [ -d $(XFIGDOCDIR)/html/images ]; then set +x; \
+ else (set -x; $(MKDIRHIER) $(XFIGDOCDIR)/html/images ); fi ; \
(cd html/images ; \
for f in * ; do \
- $(INSTALL) -c $$f $(XFIGLIBDIR)/html/images ; \
+ $(INSTALL) -c $$f $(XFIGDOCDIR)/html/images ; \
done) ; \
) ;
@@ -358,10 +361,10 @@
install.jhtml::
@echo "Copying japanese html files"
@(cd Doc/html/japanese ; \
- if [ -d $(XFIGLIBDIR)/html/japanese ]; then set +x; \
- else (set -x; $(MKDIRHIER) $(XFIGLIBDIR)/html/japanese ); fi ; \
+ if [ -d $(XFIGDOCDIR)/html/japanese ]; then set +x; \
+ else (set -x; $(MKDIRHIER) $(XFIGDOCDIR)/html/japanese ); fi ; \
for f in * ; do \
- $(INSTALL) -c $$f $(XFIGLIBDIR)/html/japanese ; \
+ $(INSTALL) -c $$f $(XFIGDOCDIR)/html/japanese ; \
done) ;
#endif
|
