]>
Commit | Line | Data |
---|---|---|
f6441b7e AM |
1 | diff -urN libwmf.orig/Makefile.in libwmf/Makefile.in |
2 | --- libwmf.orig/Makefile.in Tue Nov 14 11:32:08 2000 | |
3 | +++ libwmf/Makefile.in Thu Jan 18 16:55:47 2001 | |
4 | @@ -142,21 +142,21 @@ | |
8e362127 | 5 | @(cd libxfig && $(MAKE) realclean) || exit 1 |
23b96819 JR |
6 | |
7 | installdirs: | |
8 | - $(MKINSTALLDIRS) $(bindir) \ | |
9 | - $(libdir) | |
10 | + $(MKINSTALLDIRS) $(DESTDIR)$(bindir) \ | |
11 | + $(DESTDIR)$(libdir) | |
12 | ||
13 | install: all installdirs installsub | |
14 | - $(INSTALL) $(srcdir)/xwmf $(bindir)/xwmf | |
8e362127 | 15 | - $(INSTALL) $(srcdir)/wmftopng $(bindir)/wmftopng |
16 | - $(INSTALL) $(srcdir)/wmftofig $(bindir)/wmftofig | |
f6441b7e | 17 | - $(INSTALL) $(srcdir)/wmftoeps $(bindir)/wmftoeps |
23b96819 JR |
18 | - $(INSTALL_DATA) $(srcdir)/libwmf.a $(libdir)/libwmf.a |
19 | - $(INSTALL_DATA) $(srcdir)/libgdwmf.a $(libdir)/libgdwmf.a | |
20 | - $(INSTALL_DATA) $(srcdir)/libXwmf.a $(libdir)/libXwmf.a | |
8e362127 | 21 | - $(INSTALL_DATA) $(srcdir)/libxfwmf.a $(libdir)/libxfwmf.a |
f6441b7e | 22 | - $(INSTALL_DATA) $(srcdir)/libepswmf.a $(libdir)/libepswmf.a |
23b96819 JR |
23 | - $(INSTALL_DATA) wmfapi.h $(INCLUDEDIR)/wmfapi.h |
24 | - $(INSTALL_DATA) gdwmfapi.h $(INCLUDEDIR)/gdwmfapi.h | |
25 | - $(INSTALL_DATA) Xwmfapi.h $(INCLUDEDIR)/Xwmfapi.h | |
26 | + $(INSTALL) $(srcdir)/xwmf $(DESTDIR)$(bindir)/xwmf | |
8e362127 | 27 | + $(INSTALL) $(srcdir)/wmftopng $(DESTDIR)$(bindir)/wmftopng |
28 | + $(INSTALL) $(srcdir)/wmftofig $(DESTDIR)$(bindir)/wmftofig | |
f6441b7e | 29 | + $(INSTALL) $(srcdir)/wmftoeps $(DESTDIR)$(bindir)/wmftoeps |
23b96819 JR |
30 | + $(INSTALL_DATA) $(srcdir)/libwmf.a $(DESTDIR)$(libdir)/libwmf.a |
31 | + $(INSTALL_DATA) $(srcdir)/libgdwmf.a $(DESTDIR)$(libdir)/libgdwmf.a | |
32 | + $(INSTALL_DATA) $(srcdir)/libXwmf.a $(DESTDIR)$(libdir)/libXwmf.a | |
8e362127 | 33 | + $(INSTALL_DATA) $(srcdir)/libxfwmf.a $(DESTDIR)$(libdir)/libxfwmf.a |
f6441b7e | 34 | + $(INSTALL_DATA) $(srcdir)/libepswmf.a $(DESTDIR)$(libdir)/libepswmf.a |
23b96819 JR |
35 | + $(INSTALL_DATA) wmfapi.h $(DESTDIR)$(INCLUDEDIR)/wmfapi.h |
36 | + $(INSTALL_DATA) gdwmfapi.h $(DESTDIR)$(INCLUDEDIR)/gdwmfapi.h | |
37 | + $(INSTALL_DATA) Xwmfapi.h $(DESTDIR)$(INCLUDEDIR)/Xwmfapi.h | |
38 | ||
39 | # DO NOT DELETE THIS LINE -- make depend depends on it. | |
f6441b7e AM |
40 | diff -urN libwmf.orig/libdib/Makefile.in libwmf/libdib/Makefile.in |
41 | --- libwmf.orig/libdib/Makefile.in Tue Nov 14 11:32:10 2000 | |
42 | +++ libwmf/libdib/Makefile.in Thu Jan 18 16:56:38 2001 | |
23b96819 JR |
43 | @@ -54,12 +54,12 @@ |
44 | rm -rf config.cache config.status config.log Makefile config.h lex.yy.c *.o *.a test_dibtoxpm core | |
45 | ||
46 | installdirs: | |
47 | - $(MKINSTALLDIRS) @libdir@ \ | |
48 | - $(INCLUDEDIR) | |
49 | + $(MKINSTALLDIRS) $(DESTDIR)@libdir@ \ | |
50 | + $(DESTDIR)$(INCLUDEDIR) | |
51 | ||
52 | install: all installdirs | |
53 | - $(INSTALL_DATA) dibtoxpm.h $(INCLUDEDIR)/dibtoxpm.h | |
54 | - $(INSTALL_DATA) libdib.a @libdir@/libdib.a | |
55 | + $(INSTALL_DATA) dibtoxpm.h $(DESTDIR)$(INCLUDEDIR)/dibtoxpm.h | |
56 | + $(INSTALL_DATA) libdib.a $(DESTDIR)@libdir@/libdib.a | |
57 | ||
58 | ||
59 | # DO NOT DELETE THIS LINE -- make depend depends on it. | |
f6441b7e AM |
60 | diff -urN libwmf.orig/libsvg/Makefile.in libwmf/libsvg/Makefile.in |
61 | --- libwmf.orig/libsvg/Makefile.in Tue Nov 14 11:32:10 2000 | |
62 | +++ libwmf/libsvg/Makefile.in Thu Jan 18 16:57:00 2001 | |
8e362127 | 63 | @@ -51,11 +51,11 @@ |
64 | rm -rf config.cache config.status config.log Makefile config.h lex.yy.c *.o *.a core | |
65 | ||
66 | install: all installdirs | |
67 | - $(INSTALL_DATA) libsvg.a @libdir@/libsvg.a | |
68 | + $(INSTALL_DATA) libsvg.a $(DESTDIR)@libdir@/libsvg.a | |
23b96819 JR |
69 | |
70 | installdirs: | |
71 | - $(MKINSTALLDIRS) @libdir@ \ | |
72 | - $(INCLUDEDIR) | |
73 | + $(MKINSTALLDIRS) $(DESTDIR)@libdir@ \ | |
74 | + $(DESTDIR)$(INCLUDEDIR) | |
75 | ||
8e362127 | 76 | |
77 | # DO NOT DELETE THIS LINE -- make depend depends on it. | |
f6441b7e AM |
78 | diff -urN libwmf.orig/libxfig/Makefile.in libwmf/libxfig/Makefile.in |
79 | --- libwmf.orig/libxfig/Makefile.in Tue Nov 14 11:32:10 2000 | |
80 | +++ libwmf/libxfig/Makefile.in Thu Jan 18 16:57:18 2001 | |
81 | @@ -61,12 +61,12 @@ | |
8e362127 | 82 | rm -rf config.cache config.status config.log Makefile config.h lex.yy.c *.o *.a core |
83 | ||
23b96819 | 84 | install: all installdirs |
8e362127 | 85 | - $(INSTALL_DATA) libxfig.a @libdir@/libxfig.a |
f6441b7e | 86 | - $(INSTALL_DATA) libeps.a @libdir@/libeps.a |
8e362127 | 87 | + $(INSTALL_DATA) libxfig.a $(DESTDIR)@libdir@/libxfig.a |
f6441b7e | 88 | + $(INSTALL_DATA) libeps.a $(DESTDIR)@libdir@/libeps.a |
8e362127 | 89 | |
90 | installdirs: | |
91 | - $(MKINSTALLDIRS) @libdir@ \ | |
92 | - $(INCLUDEDIR) | |
93 | + $(MKINSTALLDIRS) $(DESTDIR)@libdir@ \ | |
94 | + $(DESTDIR)$(INCLUDEDIR) | |
95 | ||
96 | ||
97 | # DO NOT DELETE THIS LINE -- make depend depends on it. | |
f6441b7e AM |
98 | diff -urN libwmf.orig/xgd-1.7.3/Makefile.in libwmf/xgd-1.7.3/Makefile.in |
99 | --- libwmf.orig/xgd-1.7.3/Makefile.in Tue Nov 14 11:32:11 2000 | |
100 | +++ libwmf/xgd-1.7.3/Makefile.in Thu Jan 18 16:59:07 2001 | |
101 | @@ -82,24 +82,24 @@ | |
102 | ||
103 | all: libxgd.a $(PROGRAMS) | |
104 | ||
105 | -install: libxgd.a $(BIN_PROGRAMS) | |
106 | - $(INSTALL) libxgd.a $(INSTALL_LIB)/libxgd.a | |
107 | - $(INSTALL) pngtogd $(INSTALL_BIN)/pngtogd | |
108 | - $(INSTALL) pngtogd2 $(INSTALL_BIN)/pngtogd2 | |
109 | - $(INSTALL) gdtopng $(INSTALL_BIN)/gdtopng | |
110 | - $(INSTALL) gd2topng $(INSTALL_BIN)/gd2topng | |
111 | - $(INSTALL) gd2copypal $(INSTALL_BIN)/gd2copypal | |
112 | - $(INSTALL) gdparttopng $(INSTALL_BIN)/gdparttopng | |
113 | - $(INSTALL) webpng $(INSTALL_BIN)/webpng | |
114 | - $(INSTALL) bdftogd $(INSTALL_BIN)/bdftogd | |
115 | - $(INSTALL_DATA) gd.h $(INSTALL_INCLUDE)/gd.h | |
116 | - $(INSTALL_DATA) gdcache.h $(INSTALL_INCLUDE)/gdcache.h | |
117 | - $(INSTALL_DATA) gd_io.h $(INSTALL_INCLUDE)/gd_io.h | |
118 | - $(INSTALL_DATA) gdfontg.h $(INSTALL_INCLUDE)/gdfontg.h | |
119 | - $(INSTALL_DATA) gdfontl.h $(INSTALL_INCLUDE)/gdfontl.h | |
120 | - $(INSTALL_DATA) gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h | |
121 | - $(INSTALL_DATA) gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h | |
122 | - $(INSTALL_DATA) gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h | |
123 | +install: libxgd.a $(BIN_PROGRAMS) | |
124 | + $(INSTALL) libxgd.a $(DESTDIR)$(INSTALL_LIB)/libxgd.a | |
125 | + $(INSTALL) pngtogd $(DESTDIR)$(INSTALL_BIN)/pngtogd | |
126 | + $(INSTALL) pngtogd2 $(DESTDIR)$(INSTALL_BIN)/pngtogd2 | |
127 | + $(INSTALL) gdtopng $(DESTDIR)$(INSTALL_BIN)/gdtopng | |
128 | + $(INSTALL) gd2topng $(DESTDIR)$(INSTALL_BIN)/gd2topng | |
129 | + $(INSTALL) gd2copypal $(DESTDIR)$(INSTALL_BIN)/gd2copypal | |
130 | + $(INSTALL) gdparttopng $(DESTDIR)$(INSTALL_BIN)/gdparttopng | |
131 | + $(INSTALL) webpng $(DESTDIR)$(INSTALL_BIN)/webpng | |
132 | + $(INSTALL) bdftogd $(DESTDIR)$(INSTALL_BIN)/bdftogd | |
133 | + $(INSTALL_DATA) gd.h $(DESTDIR)$(INSTALL_INCLUDE)/gd.h | |
134 | + $(INSTALL_DATA) gdcache.h $(DESTDIR)$(INSTALL_INCLUDE)/gdcache.h | |
135 | + $(INSTALL_DATA) gd_io.h $(DESTDIR)$(INSTALL_INCLUDE)/gd_io.h | |
136 | + $(INSTALL_DATA) gdfontg.h $(DESTDIR)$(INSTALL_INCLUDE)/gdfontg.h | |
137 | + $(INSTALL_DATA) gdfontl.h $(DESTDIR)$(INSTALL_INCLUDE)/gdfontl.h | |
138 | + $(INSTALL_DATA) gdfontmb.h $(DESTDIR)$(INSTALL_INCLUDE)/gdfontmb.h | |
139 | + $(INSTALL_DATA) gdfonts.h $(DESTDIR)$(INSTALL_INCLUDE)/gdfonts.h | |
140 | + $(INSTALL_DATA) gdfontt.h $(DESTDIR)$(INSTALL_INCLUDE)/gdfontt.h | |
141 | ||
142 | gddemo: gddemo.o libxgd.a | |
143 | $(CC) gddemo.o -o gddemo $(LIBDIRS) $(LIBS) |