]>
Commit | Line | Data |
---|---|---|
4ee03dbc AM |
1 | diff -urN wv.org/Makefile.in wv/Makefile.in |
2 | --- wv.org/Makefile.in Thu Jan 18 10:02:38 2001 | |
3 | +++ wv/Makefile.in Thu Jan 18 10:03:29 2001 | |
a15d7587 | 4 | @@ -401,15 +401,12 @@ |
5 | @(cd exporter && $(MAKE) realclean) || exit 1 | |
4324773d | 6 | |
7 | installdirs: | |
8 | - $(MKINSTALLDIRS) $(bindir) \ | |
9 | - $(mandir) \ | |
10 | - $(mandir)/man1 \ | |
11 | - $(libdir) \ | |
12 | - $(libdir)/wv\ | |
4324773d | 13 | - $(libdir)/wv/wingdingfont \ |
14 | - $(libdir)/wv/patterns \ | |
15 | - $(libdir)/wv/ttf \ | |
a15d7587 | 16 | - $(includedir) |
4324773d | 17 | + $(MKINSTALLDIRS) $(DESTDIR)$(bindir) \ |
4324773d | 18 | + $(DESTDIR)$(mandir)/man1 \ |
4324773d | 19 | + $(DESTDIR)$(libdir)/wv/wingdingfont \ |
20 | + $(DESTDIR)$(libdir)/wv/patterns \ | |
21 | + $(DESTDIR)$(libdir)/wv/ttf \ | |
a15d7587 | 22 | + $(DESTDIR)$(includedir) |
4324773d | 23 | |
24 | install: installdirs all | |
2ee776bd | 25 | chmod +x $(srcdir)/wvHtml |
a15d7587 | 26 | @@ -418,54 +415,53 @@ |
27 | chmod +x $(srcdir)/wvWml | |
28 | chmod +x $(srcdir)/wvCleanLatex | |
29 | chmod +x $(srcdir)/wvAbw | |
4324773d | 30 | - $(INSTALL) $(srcdir)/wvSummary$(EXEEXT) $(bindir)/wvSummary$(EXEEXT) |
31 | - $(INSTALL) $(srcdir)/wvSimpleCLX$(EXEEXT) $(bindir)/wvSimpleCLX$(EXEEXT) | |
32 | - $(INSTALL) $(srcdir)/wvVersion$(EXEEXT) $(bindir)/wvVersion$(EXEEXT) | |
33 | - $(INSTALL) $(srcdir)/wvConvert$(EXEEXT) $(bindir)/wvConvert$(EXEEXT) | |
2ee776bd | 34 | - $(INSTALL) $(srcdir)/wvWare$(EXEEXT) $(bindir)/wvWare$(EXEEXT) |
35 | - $(INSTALL) $(srcdir)/wvCleanLatex $(bindir)/wvCleanLatex | |
36 | - $(INSTALL) $(srcdir)/wvHtml $(bindir)/wvHtml | |
a15d7587 | 37 | - $(INSTALL) $(srcdir)/wvAbw $(bindir)/wvAbw |
2ee776bd | 38 | - $(INSTALL) $(srcdir)/wvMime $(bindir)/wvMime |
39 | - $(INSTALL) $(srcdir)/wvPS $(bindir)/wvPS | |
40 | - $(INSTALL) $(srcdir)/wvDVI $(bindir)/wvDVI | |
41 | - $(INSTALL) $(srcdir)/wvLatex $(bindir)/wvLatex | |
42 | - $(INSTALL) $(srcdir)/wvPDF $(bindir)/wvPDF | |
43 | - $(INSTALL) $(srcdir)/wvText $(bindir)/wvText | |
a15d7587 | 44 | - $(INSTALL) $(srcdir)/wvWml $(bindir)/wvWml |
4324773d | 45 | - $(INSTALL) $(srcdir)/wv-libconfig $(bindir)/wv-libconfig |
46 | - $(INSTALL) $(srcdir)/wv-incconfig $(bindir)/wv-incconfig | |
a15d7587 | 47 | - $(INSTALL) $(srcdir)/make_epses.sh $(bindir)/make_epses.sh |
2ee776bd | 48 | - $(INSTALL_DATA) $(srcdir)/wvWare.1 $(mandir)/man1/ |
4324773d | 49 | - $(INSTALL_DATA) $(srcdir)/wvHtml.1 $(mandir)/man1/ |
2ee776bd | 50 | - $(INSTALL_DATA) $(srcdir)/wvLatex.1 $(mandir)/man1/ |
51 | - $(INSTALL_DATA) $(srcdir)/wvCleanLatex.1 $(mandir)/man1/ | |
52 | - $(INSTALL_DATA) $(srcdir)/wvDVI.1 $(mandir)/man1/ | |
53 | - $(INSTALL_DATA) $(srcdir)/wvPS.1 $(mandir)/man1/ | |
54 | - $(INSTALL_DATA) $(srcdir)/wvPDF.1 $(mandir)/man1/ | |
55 | - $(INSTALL_DATA) $(srcdir)/wvText.1 $(mandir)/man1/ | |
a15d7587 | 56 | - $(INSTALL_DATA) $(srcdir)/wvWml.1 $(mandir)/man1/ |
57 | - $(INSTALL_DATA) $(srcdir)/wvAbw.1 $(mandir)/man1/ | |
58 | - $(RM) -f $(mandir)/man1/wvConvert.1 | |
2ee776bd | 59 | - $(LN) -s $(mandir)/man1/wvWare.1 $(mandir)/man1/wvConvert.1 |
60 | - $(INSTALL_DATA) $(srcdir)/wvMime.1 $(mandir)/man1/ | |
61 | - $(INSTALL_DATA) $(srcdir)/wvVersion.1 $(mandir)/man1/ | |
62 | - $(INSTALL_DATA) $(srcdir)/wvSummary.1 $(mandir)/man1/ | |
4324773d | 63 | - $(INSTALL_DATA) wv.h $(includedir)/wv.h |
a15d7587 | 64 | - $(INSTALL_DATA) exporter/wvexporter.h $(includedir)/wvexporter.h |
4324773d | 65 | - $(INSTALL_DATA) $(srcdir)/libwv.a $(libdir)/libwv.a |
a15d7587 | 66 | - $(INSTALL_DATA) $(srcdir)/wvText.xml $(libdir)/wv/wvText.xml |
4324773d | 67 | - $(INSTALL_DATA) $(srcdir)/wvHtml.xml $(libdir)/wv/wvHtml.xml |
2ee776bd | 68 | - $(INSTALL_DATA) $(srcdir)/wvLaTeX.xml $(libdir)/wv/wvLaTeX.xml |
a15d7587 | 69 | - $(INSTALL_DATA) $(srcdir)/wvAbw.xml $(libdir)/wv/wvAbw.xml |
70 | - $(INSTALL_DATA) $(srcdir)/wvWml.xml $(libdir)/wv/wvWml.xml | |
2ee776bd | 71 | - $(INSTALL_DATA) $(srcdir)/wvCleanLaTeX.xml $(libdir)/wv/wvCleanLaTeX.xml |
4324773d | 72 | - $(INSTALL_DATA) $(srcdir)/wvConfig.xml $(libdir)/wv/wvConfig.xml |
73 | + $(INSTALL) $(srcdir)/wvSummary$(EXEEXT) $(DESTDIR)$(bindir)/wvSummary$(EXEEXT) | |
74 | + $(INSTALL) $(srcdir)/wvSimpleCLX$(EXEEXT) $(DESTDIR)$(bindir)/wvSimpleCLX$(EXEEXT) | |
75 | + $(INSTALL) $(srcdir)/wvVersion$(EXEEXT) $(DESTDIR)$(bindir)/wvVersion$(EXEEXT) | |
76 | + $(INSTALL) $(srcdir)/wvConvert$(EXEEXT) $(DESTDIR)$(bindir)/wvConvert$(EXEEXT) | |
2ee776bd | 77 | + $(INSTALL) $(srcdir)/wvWare$(EXEEXT) $(DESTDIR)$(bindir)/wvWare$(EXEEXT) |
78 | + $(INSTALL) $(srcdir)/wvCleanLatex $(DESTDIR)$(bindir)/wvCleanLatex | |
79 | + $(INSTALL) $(srcdir)/wvHtml $(DESTDIR)$(bindir)/wvHtml | |
a15d7587 | 80 | + $(INSTALL) $(srcdir)/wvAbw $(DESTDIR)$(bindir)/wvAbw |
2ee776bd | 81 | + $(INSTALL) $(srcdir)/wvMime $(DESTDIR)$(bindir)/wvMime |
82 | + $(INSTALL) $(srcdir)/wvPS $(DESTDIR)$(bindir)/wvPS | |
83 | + $(INSTALL) $(srcdir)/wvDVI $(DESTDIR)$(bindir)/wvDVI | |
84 | + $(INSTALL) $(srcdir)/wvLatex $(DESTDIR)$(bindir)/wvLatex | |
85 | + $(INSTALL) $(srcdir)/wvPDF $(DESTDIR)$(bindir)/wvPDF | |
86 | + $(INSTALL) $(srcdir)/wvText $(DESTDIR)$(bindir)/wvText | |
a15d7587 | 87 | + $(INSTALL) $(srcdir)/wvWml $(DESTDIR)$(bindir)/wvWml |
4324773d | 88 | + $(INSTALL) $(srcdir)/wv-libconfig $(DESTDIR)$(bindir)/wv-libconfig |
89 | + $(INSTALL) $(srcdir)/wv-incconfig $(DESTDIR)$(bindir)/wv-incconfig | |
a15d7587 | 90 | + $(INSTALL) $(srcdir)/make_epses.sh $(DESTDIR)$(bindir)/make_epses.sh |
2ee776bd | 91 | + $(INSTALL_DATA) $(srcdir)/wvWare.1 $(DESTDIR)$(mandir)/man1/ |
4324773d | 92 | + $(INSTALL_DATA) $(srcdir)/wvHtml.1 $(DESTDIR)$(mandir)/man1/ |
2ee776bd | 93 | + $(INSTALL_DATA) $(srcdir)/wvLatex.1 $(DESTDIR)$(mandir)/man1/ |
94 | + $(INSTALL_DATA) $(srcdir)/wvCleanLatex.1 $(DESTDIR)$(mandir)/man1/ | |
95 | + $(INSTALL_DATA) $(srcdir)/wvDVI.1 $(DESTDIR)$(mandir)/man1/ | |
96 | + $(INSTALL_DATA) $(srcdir)/wvPS.1 $(DESTDIR)$(mandir)/man1/ | |
97 | + $(INSTALL_DATA) $(srcdir)/wvPDF.1 $(DESTDIR)$(mandir)/man1/ | |
98 | + $(INSTALL_DATA) $(srcdir)/wvText.1 $(DESTDIR)$(mandir)/man1/ | |
a15d7587 | 99 | + $(INSTALL_DATA) $(srcdir)/wvWml.1 $(DESTDIR)$(mandir)/man1/ |
100 | + $(INSTALL_DATA) $(srcdir)/wvAbw.1 $(DESTDIR)$(mandir)/man1/ | |
101 | + echo ".so wvWare.1" > $(DESTDIR)$(mandir)/man1/wvConvert.1 | |
2ee776bd | 102 | + $(INSTALL_DATA) $(srcdir)/wvMime.1 $(DESTDIR)$(mandir)/man1/ |
103 | + $(INSTALL_DATA) $(srcdir)/wvVersion.1 $(DESTDIR)$(mandir)/man1/ | |
104 | + $(INSTALL_DATA) $(srcdir)/wvSummary.1 $(DESTDIR)$(mandir)/man1/ | |
4324773d | 105 | + $(INSTALL_DATA) wv.h $(DESTDIR)$(includedir)/wv.h |
a15d7587 | 106 | + $(INSTALL_DATA) exporter/wvexporter.h $(DESTDIR)$(includedir)/wvexporter.h |
4324773d | 107 | + $(INSTALL_DATA) $(srcdir)/libwv.a $(DESTDIR)$(libdir)/libwv.a |
a15d7587 | 108 | + $(INSTALL_DATA) $(srcdir)/wvText.xml $(DESTDIR)$(libdir)/wv/wvText.xml |
4324773d | 109 | + $(INSTALL_DATA) $(srcdir)/wvHtml.xml $(DESTDIR)$(libdir)/wv/wvHtml.xml |
2ee776bd | 110 | + $(INSTALL_DATA) $(srcdir)/wvLaTeX.xml $(DESTDIR)$(libdir)/wv/wvLaTeX.xml |
a15d7587 | 111 | + $(INSTALL_DATA) $(srcdir)/wvAbw.xml $(DESTDIR)$(libdir)/wv/wvAbw.xml |
112 | + $(INSTALL_DATA) $(srcdir)/wvWml.xml $(DESTDIR)$(libdir)/wv/wvWml.xml | |
2ee776bd | 113 | + $(INSTALL_DATA) $(srcdir)/wvCleanLaTeX.xml $(DESTDIR)$(libdir)/wv/wvCleanLaTeX.xml |
4324773d | 114 | + $(INSTALL_DATA) $(srcdir)/wvConfig.xml $(DESTDIR)$(libdir)/wv/wvConfig.xml |
4324773d | 115 | for filename in wingdingfont/*.gif; do \ |
116 | - $(INSTALL_DATA) $$filename $(libdir)/wv/wingdingfont; \ | |
117 | + $(INSTALL_DATA) $$filename $(DESTDIR)$(libdir)/wv/wingdingfont; \ | |
118 | done | |
119 | for filename in patterns/*.gif patterns/*.jpg; do \ | |
120 | - $(INSTALL_DATA) $$filename $(libdir)/wv/patterns; \ | |
121 | + $(INSTALL_DATA) $$filename $(DESTDIR)$(libdir)/wv/patterns; \ | |
122 | done | |
123 | ||
124 | ||
4ee03dbc AM |
125 | diff -urN wv.org/configure.in wv/configure.in |
126 | --- wv.org/configure.in Thu Jan 18 10:02:43 2001 | |
127 | +++ wv/configure.in Thu Jan 18 11:06:42 2001 | |
128 | @@ -102,7 +102,8 @@ | |
129 | if test [ "$no_x" = yes ]; then | |
130 | X11="" | |
131 | else | |
132 | - X11="-lX11" | |
133 | + LDFLAGS="$LDFLAGS -L/usr/X11R6/lib" | |
134 | + X11="-L/usr/X11R6/lib -lX11" | |
135 | fi | |
136 | ||
137 | AC_SUBST(X11) | |
138 | @@ -311,7 +312,7 @@ | |
139 | AC_DEFINE(HAVE_WMF) | |
140 | HAVE_WMF=1 | |
141 | WMF_CFLAGS="-I$WMF_DIR/include" | |
142 | - WMF_LIBS="-L$WMF_DIR/lib -lgdwmf"], , | |
143 | + WMF_LIBS="-L$WMF_DIR/lib -lgdwmf -lwmf -lgd -lxgd -ldib"], , | |
144 | [-lwmf -lxgd -ldib $XPM_LIBS -lX11 $TTF_LIBS $PNG_LIBS $ZLIB_LIBS -lm])) | |
145 | ||
146 | CPPFLAGS=${_cppflags} | |
397b6dd4 | 147 |