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
7 #ifdef USEINSTALLEDJPEG
8 -JPEGLIBDIR = /usr/local/lib
9 -JPEGINCDIR = /usr/include/X11
10 +JPEGLIBDIR = /usr/lib
11 +JPEGINCDIR = /usr/include
14 JPEGINCDIR = $(JPEGLIBDIR)
16 XCOMM Change XPMLIBDIR if necessary to point to the xpm library (libXpm)
17 XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
20 -XCOMM #define USEXPM_ICON
25 XPMLIBDIR = $(USRLIBDIR)
26 -XPMINC = -I/usr/include/X11
27 +XPMINC = -I/usr/X11R6/include/X11/
30 XCOMM Uncomment the following definiton if you want to use the small icons
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.
38 XCOMM If using an input tablet uncomment the following
41 XCOMM inline functions. With the "INLINE" keyword, you should notice that
42 XCOMM the display will be a bit faster in complex figures
44 -XCOMM USEINLINE = -DUSE_INLINE
45 +USEINLINE = -DUSE_INLINE
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
53 -I18N_DEFS = -DI18N -DSETLOCALE
59 XCOMM here with "make install"
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)
77 - echo Copying pdf and html files to $(XFIGLIBDIR) ; \
78 - $(INSTALL) -c xfig.html $(XFIGLIBDIR) ; \
79 - $(INSTALL) -c xfig-howto.pdf $(XFIGLIBDIR) ; \
80 - if [ -d $(XFIGLIBDIR)/html ]; then set +x; \
81 - else (set -x; $(MKDIRHIER) $(XFIGLIBDIR)/html ); fi ; \
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 ; \
89 - $(INSTALL) -c $$f $(XFIGLIBDIR)/html ; \
90 + $(INSTALL) -c $$f $(DESTDIR)$(XFIGLIBDIR)/html ; \
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 ; \
95 + if [ -d $(DESTDIR)$(XFIGLIBDIR)/html/images ]; then set +x; \
96 + else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR)/html/images ); fi ; \
99 - $(INSTALL) -c $$f $(XFIGLIBDIR)/html/images ; \
100 + $(INSTALL) -c $$f $(DESTDIR)$(XFIGLIBDIR)/html/images ; \
104 @@ -358,48 +358,48 @@
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 ; \
113 - $(INSTALL) -c $$f $(XFIGLIBDIR)/html/japanese ; \
114 + $(INSTALL) -c $$f $(DESTDIR)$(XFIGLIBDIR)/html/japanese ; \
118 XCOMM Install the object libraries here with "make install.libs"
120 @echo "Copying Fig Object Libraries"
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 ; \
129 - if [ -d $(OBJLIBDIR)/$$d ]; then set +x; \
130 - else (set -x; $(MKDIRHIER) $(OBJLIBDIR)/$$d ); fi ; \
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" ; \
136 if [ -d $$f ]; then ( \
137 - if [ -d $(OBJLIBDIR)/$$d/$$f ]; then set +x; \
138 - else (set -x; $(MKDIRHIER) $(OBJLIBDIR)/$$d/$$f ); fi ; \
139 + if [ -d $(DESTDIR)$(OBJLIBDIR)/$$d/$$f ]; then set +x; \
140 + else (set -x; $(MKDIRHIER) $(DESTDIR)$(OBJLIBDIR)/$$d/$$f ); fi ; \
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 ; \
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 ; \
157 - $(INSTALL) -c $$m $(OBJLIBDIR)/$$d/$$f/$$dd/$$l ; \
158 + $(INSTALL) -c $$m $(DESTDIR)$(OBJLIBDIR)/$$d/$$f/$$dd/$$l ; \
160 - else ( $(INSTALL) -c $$l $(OBJLIBDIR)/$$d/$$f/$$dd ) ; fi ; \
161 + else ( $(INSTALL) -c $$l $(DESTDIR)$(OBJLIBDIR)/$$d/$$f/$$dd ) ; fi ; \
163 - else ( $(INSTALL) -c $$dd $(OBJLIBDIR)/$$d/$$f ) ; fi ; \
164 + else ( $(INSTALL) -c $$dd $(DESTDIR)$(OBJLIBDIR)/$$d/$$f ) ; fi ; \
166 - else ($(INSTALL) -c $$f $(OBJLIBDIR)/$$d ) ; fi ; \
167 + else ($(INSTALL) -c $$f $(DESTDIR)$(OBJLIBDIR)/$$d ) ; fi ; \
170 else echo No Object Libraries to install ; \