]>
Commit | Line | Data |
---|---|---|
44413d73 | 1 | diff -Nru xfig.3.2.3/Imakefile xfig.3.2.3.new/Imakefile |
2 | --- xfig.3.2.3/Imakefile Fri Jan 21 02:45:28 2000 | |
3 | +++ xfig.3.2.3.new/Imakefile Fri Jan 21 02:46:22 2000 | |
4 | @@ -40,8 +40,8 @@ | |
50176856 | 5 | |
6 | #ifdef USEJPEG | |
7 | #ifdef USEINSTALLEDJPEG | |
8 | -JPEGLIBDIR = /usr/local/lib | |
44413d73 | 9 | -JPEGINCDIR = /usr/include/X11 |
50176856 | 10 | +JPEGLIBDIR = /usr/lib |
44413d73 | 11 | +JPEGINCDIR = /usr/include |
50176856 | 12 | #else |
13 | JPEGLIBDIR = ../jpeg | |
44413d73 | 14 | JPEGINCDIR = $(JPEGLIBDIR) |
15 | @@ -59,12 +59,12 @@ | |
16 | XCOMM Change XPMLIBDIR if necessary to point to the xpm library (libXpm) | |
50176856 | 17 | XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h) |
18 | ||
19 | -XCOMM #define USEXPM | |
20 | -XCOMM #define USEXPM_ICON | |
21 | +#define USEXPM | |
22 | +#define USEXPM_ICON | |
23 | ||
24 | #ifdef USEXPM | |
25 | XPMLIBDIR = $(USRLIBDIR) | |
44413d73 | 26 | -XPMINC = -I/usr/include/X11 |
27 | +XPMINC = -I/usr/X11R6/include/X11/ | |
50176856 | 28 | #endif |
29 | ||
44413d73 | 30 | XCOMM Uncomment the following definiton if you want to use the small icons |
31 | @@ -99,7 +99,7 @@ | |
32 | XCOMM Uncomment the next line if you want use Japanese (i18n) on xfig. | |
33 | XCOMM If your setlocale() dosen't support the locale, you should | |
34 | XCOMM add -DSETLOCALE to I18N_DEFS. | |
35 | -XCOMM #define I18N | |
36 | +#define I18N | |
37 | ||
38 | XCOMM If using an input tablet uncomment the following | |
39 | ||
40 | @@ -110,7 +110,7 @@ | |
50176856 | 41 | XCOMM inline functions. With the "INLINE" keyword, you should notice that |
42 | XCOMM the display will be a bit faster in complex figures | |
43 | ||
44 | -XCOMM USEINLINE = -DUSE_INLINE | |
45 | +USEINLINE = -DUSE_INLINE | |
46 | ||
47 | XCOMM use (and change) the following if you want the multi-key data base file | |
48 | XCOMM somewhere other than the standard X11 library directory | |
44413d73 | 49 | @@ -189,7 +189,7 @@ |
50 | #endif /* USEJPEG */ | |
51 | ||
52 | #ifdef I18N | |
53 | -I18N_DEFS = -DI18N -DSETLOCALE | |
54 | +I18N_DEFS = -DI18N | |
55 | I18N_SRC = w_i18n.c | |
56 | I18N_OBJ = w_i18n.o | |
57 | #endif | |
58 | @@ -321,10 +321,10 @@ | |
59 | XCOMM here with "make install" | |
50176856 | 60 | |
50176856 | 61 | install:: |
44413d73 | 62 | - @if [ -d $(XFIGLIBDIR) ]; then set +x; \ |
63 | - else (set -x; $(MKDIRHIER) $(XFIGLIBDIR) ; set +x; ); fi | |
64 | - chmod a+x,u+w $(XFIGLIBDIR) | |
65 | - $(INSTALL) -c CompKeyDB $(XFIGLIBDIR) | |
66 | + @if [ -d $(DESTDIR)$(XFIGLIBDIR) ]; then set +x; \ | |
67 | + else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR) ; set +x; ); fi | |
68 | + chmod a+x,u+w $(DESTDIR)$(XFIGLIBDIR) | |
69 | + $(INSTALL) -c CompKeyDB $(DESTDIR)$(XFIGLIBDIR) | |
70 | make install.libs | |
71 | make install.doc | |
72 | ||
73 | @@ -336,21 +336,21 @@ | |
74 | @make install.jhtml | |
75 | #endif | |
50176856 | 76 | @(cd Doc ; \ |
44413d73 | 77 | - echo Copying pdf and html files to $(XFIGLIBDIR) ; \ |
78 | - $(INSTALL) -c xfig.html $(XFIGLIBDIR) ; \ | |
50176856 | 79 | - $(INSTALL) -c xfig-howto.pdf $(XFIGLIBDIR) ; \ |
50176856 | 80 | - if [ -d $(XFIGLIBDIR)/html ]; then set +x; \ |
81 | - else (set -x; $(MKDIRHIER) $(XFIGLIBDIR)/html ); fi ; \ | |
44413d73 | 82 | + echo Copying pdf and html files to $(DESTDIR)$(XFIGLIBDIR) ; \ |
83 | + $(INSTALL) -c xfig.html $(DESTDIR)$(XFIGLIBDIR) ; \ | |
84 | + $(INSTALL) -c xfig-howto.pdf $(DESTDIR)$(XFIGLIBDIR) ; \ | |
85 | + if [ -d $(DESTDIR)$(XFIGLIBDIR)/html ]; then set +x; \ | |
86 | + else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR)/html ); fi ; \ | |
87 | (cd html ; \ | |
88 | for f in *.* ; do \ | |
89 | - $(INSTALL) -c $$f $(XFIGLIBDIR)/html ; \ | |
90 | + $(INSTALL) -c $$f $(DESTDIR)$(XFIGLIBDIR)/html ; \ | |
91 | done) ; \ | |
50176856 | 92 | echo " Copying image files for html" ; \ |
93 | - if [ -d $(XFIGLIBDIR)/html/images ]; then set +x; \ | |
94 | - else (set -x; $(MKDIRHIER) $(XFIGLIBDIR)/html/images ); fi ; \ | |
44413d73 | 95 | + if [ -d $(DESTDIR)$(XFIGLIBDIR)/html/images ]; then set +x; \ |
96 | + else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR)/html/images ); fi ; \ | |
97 | (cd html/images ; \ | |
98 | for f in * ; do \ | |
99 | - $(INSTALL) -c $$f $(XFIGLIBDIR)/html/images ; \ | |
100 | + $(INSTALL) -c $$f $(DESTDIR)$(XFIGLIBDIR)/html/images ; \ | |
101 | done) ; \ | |
50176856 | 102 | ) ; |
44413d73 | 103 | |
104 | @@ -358,48 +358,48 @@ | |
105 | install.jhtml:: | |
106 | @echo "Copying japanese html files" | |
107 | @(cd Doc/html/japanese ; \ | |
108 | - if [ -d $(XFIGLIBDIR)/html/japanese ]; then set +x; \ | |
109 | - else (set -x; $(MKDIRHIER) $(XFIGLIBDIR)/html/japanese ); fi ; \ | |
110 | + if [ -d $(DESTDIR)$(XFIGLIBDIR)/html/japanese ]; then set +x; \ | |
111 | + else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR)/html/japanese ); fi ; \ | |
112 | for f in * ; do \ | |
113 | - $(INSTALL) -c $$f $(XFIGLIBDIR)/html/japanese ; \ | |
114 | + $(INSTALL) -c $$f $(DESTDIR)$(XFIGLIBDIR)/html/japanese ; \ | |
115 | done) ; | |
116 | #endif | |
117 | ||
118 | XCOMM Install the object libraries here with "make install.libs" | |
119 | install.libs:: | |
50176856 | 120 | @echo "Copying Fig Object Libraries" |
44413d73 | 121 | - @if [ -d $(OBJLIBDIR) ]; then set +x; \ |
122 | - else (set -x; $(MKDIRHIER) $(OBJLIBDIR) ; set +x; ); fi | |
123 | + @if [ -d $(DESTDIR)$(OBJLIBDIR) ]; then set +x; \ | |
124 | + else (set -x; $(MKDIRHIER) $(DESTDIR)$(OBJLIBDIR) ; set +x; ); fi | |
125 | @if [ -d Examples/Libraries ]; then \ | |
126 | (cd Examples/Libraries ; \ | |
50176856 | 127 | for d in * ; do \ |
128 | (cd $$d ; \ | |
129 | - if [ -d $(OBJLIBDIR)/$$d ]; then set +x; \ | |
130 | - else (set -x; $(MKDIRHIER) $(OBJLIBDIR)/$$d ); fi ; \ | |
44413d73 | 131 | - echo " Copying $$d library files to $(OBJLIBDIR)/$$d" ; \ |
132 | + if [ -d $(DESTDIR)$(OBJLIBDIR)/$$d ]; then set +x; \ | |
133 | + else (set -x; $(MKDIRHIER) $(DESTDIR)$(OBJLIBDIR)/$$d ); fi ; \ | |
134 | + echo " Copying $$d library files to $(DESTDIR)$(OBJLIBDIR)/$$d" ; \ | |
50176856 | 135 | for f in * ; do \ |
136 | if [ -d $$f ]; then ( \ | |
44413d73 | 137 | - if [ -d $(OBJLIBDIR)/$$d/$$f ]; then set +x; \ |
50176856 | 138 | - else (set -x; $(MKDIRHIER) $(OBJLIBDIR)/$$d/$$f ); fi ; \ |
44413d73 | 139 | + if [ -d $(DESTDIR)$(OBJLIBDIR)/$$d/$$f ]; then set +x; \ |
140 | + else (set -x; $(MKDIRHIER) $(DESTDIR)$(OBJLIBDIR)/$$d/$$f ); fi ; \ | |
141 | (cd $$f ; \ | |
142 | for dd in * ; do \ | |
143 | if [ -d $$dd ]; then ( \ | |
144 | - if [ -d $(OBJLIBDIR)/$$d/$$f/$$dd ]; then set +x; \ | |
145 | - else (set -x; $(MKDIRHIER) $(OBJLIBDIR)/$$d/$$f/$$dd ); fi ; \ | |
146 | + if [ -d $(DESTDIR)$(OBJLIBDIR)/$$d/$$f/$$dd ]; then set +x; \ | |
147 | + else (set -x; $(MKDIRHIER) $(DESTDIR)$(OBJLIBDIR)/$$d/$$f/$$dd ); fi ; \ | |
148 | (cd $$dd ; \ | |
149 | for l in * ; do \ | |
150 | if [ -d $$l ]; then ( \ | |
151 | - if [ -d $(OBJLIBDIR)/$$d/$$f/$$dd/$$l ]; then set +x; \ | |
152 | - else (set -x; $(MKDIRHIER) $(OBJLIBDIR)/$$d/$$f/$$dd/$$l ); fi ; \ | |
153 | + if [ -d $(DESTDIR)$(OBJLIBDIR)/$$d/$$f/$$dd/$$l ]; then set +x; \ | |
154 | + else (set -x; $(MKDIRHIER) $(DESTDIR)$(OBJLIBDIR)/$$d/$$f/$$dd/$$l ); fi ; \ | |
155 | (cd $$l ; \ | |
156 | for m in * ; do \ | |
157 | - $(INSTALL) -c $$m $(OBJLIBDIR)/$$d/$$f/$$dd/$$l ; \ | |
158 | + $(INSTALL) -c $$m $(DESTDIR)$(OBJLIBDIR)/$$d/$$f/$$dd/$$l ; \ | |
159 | done ) ) ; \ | |
160 | - else ( $(INSTALL) -c $$l $(OBJLIBDIR)/$$d/$$f/$$dd ) ; fi ; \ | |
161 | + else ( $(INSTALL) -c $$l $(DESTDIR)$(OBJLIBDIR)/$$d/$$f/$$dd ) ; fi ; \ | |
162 | done) ) ; \ | |
163 | - else ( $(INSTALL) -c $$dd $(OBJLIBDIR)/$$d/$$f ) ; fi ; \ | |
164 | + else ( $(INSTALL) -c $$dd $(DESTDIR)$(OBJLIBDIR)/$$d/$$f ) ; fi ; \ | |
165 | done) ); \ | |
166 | - else ($(INSTALL) -c $$f $(OBJLIBDIR)/$$d ) ; fi ; \ | |
167 | + else ($(INSTALL) -c $$f $(DESTDIR)$(OBJLIBDIR)/$$d ) ; fi ; \ | |
50176856 | 168 | done ) ; \ |
44413d73 | 169 | done ; ) ; \ |
170 | else echo No Object Libraries to install ; \ |