]>
Commit | Line | Data |
---|---|---|
168d236f | 1 | --- cups-1.1.14/Makefile.orig Tue Feb 12 20:05:36 2002 |
2 | +++ cups-1.1.14/Makefile Sun Feb 17 13:08:13 2002 | |
3 | @@ -76,32 +76,11 @@ | |
4 | echo Installing in templates... | |
5 | (cd templates; $(MAKE) $(MFLAGS) install) | |
6 | echo Installing cups-config script... | |
7 | - $(INSTALL_DIR) $(BINDIR) | |
8 | - $(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config | |
9 | + $(INSTALL_DIR) $(DESTDIR)$(BINDIR) | |
10 | + $(INSTALL_SCRIPT) cups-config $(DESTDIR)$(BINDIR)/cups-config | |
11 | echo Installing startup script... | |
12 | - if test "x$(INITDIR)" != "x"; then \ | |
13 | - $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \ | |
14 | - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ | |
15 | - $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc0.d; \ | |
16 | - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \ | |
17 | - $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc2.d; \ | |
18 | - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \ | |
19 | - $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc3.d; \ | |
20 | - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \ | |
21 | - $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc5.d; \ | |
22 | - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \ | |
23 | - fi | |
24 | - if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \ | |
25 | - $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \ | |
26 | - if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \ | |
27 | - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/PrintingServices.sh; \ | |
28 | - $(INSTALL_DATA) cups.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \ | |
29 | - $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \ | |
30 | - $(INSTALL_DATA) cups.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \ | |
31 | - else \ | |
32 | - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \ | |
33 | - fi \ | |
34 | - fi | |
35 | + $(INSTALL_DIR) $(DESTDIR)$(bindir) | |
36 | + $(INSTALL_SCRIPT) cups-config $(DESTDIR)$(bindir)/cups-config | |
37 | ||
38 | ||
39 | # | |
40 | diff -Nur cups-1.1.12/backend/Makefile cups-1.1.12-new/backend/Makefile | |
41 | --- cups-1.1.12/backend/Makefile Tue Jul 24 21:56:41 2001 | |
42 | +++ cups-1.1.12-new/backend/Makefile Sat Nov 24 20:27:51 2001 | |
43 | @@ -49,12 +49,11 @@ | |
d1d5300a | 44 | # |
45 | ||
168d236f | 46 | install: |
bfb43493 | 47 | - $(INSTALL_DIR) $(SERVERBIN)/backend |
48 | + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/backend | |
49 | for file in $(BACKENDS); do \ | |
50 | - $(INSTALL_BIN) $$file $(SERVERBIN)/backend; \ | |
51 | + $(INSTALL_BIN) $$file $(DESTDIR)$(SERVERBIN)/backend; \ | |
d1d5300a | 52 | done |
bfb43493 | 53 | - $(RM) $(SERVERBIN)/backend/http |
54 | - $(LN) ipp $(SERVERBIN)/backend/http | |
168d236f | 55 | + $(LN) -sf ipp $(DESTDIR)$(SERVERBIN)/backend/http |
d1d5300a | 56 | |
57 | ||
58 | # | |
168d236f | 59 | diff -Nur cups-1.1.12/berkeley/Makefile cups-1.1.12-new/berkeley/Makefile |
60 | --- cups-1.1.12/berkeley/Makefile Thu Jul 19 22:17:51 2001 | |
61 | +++ cups-1.1.12-new/berkeley/Makefile Sat Nov 24 20:27:51 2001 | |
62 | @@ -48,12 +48,12 @@ | |
d1d5300a | 63 | # |
64 | ||
168d236f | 65 | install: |
bfb43493 | 66 | - $(INSTALL_DIR) $(BINDIR) |
67 | - $(INSTALL_BIN) lpq $(BINDIR) | |
68 | - $(INSTALL_BIN) lpr $(BINDIR) | |
69 | - $(INSTALL_BIN) lprm $(BINDIR) | |
70 | - $(INSTALL_DIR) $(SBINDIR) | |
71 | - $(INSTALL_BIN) lpc $(SBINDIR) | |
72 | + $(INSTALL_DIR) $(DESTDIR)$(BINDIR) | |
73 | + $(INSTALL_BIN) lpq $(DESTDIR)$(BINDIR) | |
74 | + $(INSTALL_BIN) lpr $(DESTDIR)$(BINDIR) | |
75 | + $(INSTALL_BIN) lprm $(DESTDIR)$(BINDIR) | |
76 | + $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) | |
77 | + $(INSTALL_BIN) lpc $(DESTDIR)$(SBINDIR) | |
d1d5300a | 78 | |
79 | ||
80 | # | |
168d236f | 81 | diff -Nur cups-1.1.12/cgi-bin/Makefile cups-1.1.12-new/cgi-bin/Makefile |
82 | --- cups-1.1.12/cgi-bin/Makefile Thu Jul 19 22:17:51 2001 | |
83 | +++ cups-1.1.12-new/cgi-bin/Makefile Sat Nov 24 20:27:51 2001 | |
84 | @@ -50,9 +50,9 @@ | |
d1d5300a | 85 | # |
86 | ||
168d236f | 87 | install: |
bfb43493 | 88 | - $(INSTALL_DIR) $(SERVERBIN)/cgi-bin |
89 | + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/cgi-bin | |
90 | for file in $(CGIS); do \ | |
91 | - $(INSTALL_BIN) $$file $(SERVERBIN)/cgi-bin; \ | |
92 | + $(INSTALL_BIN) $$file $(DESTDIR)$(SERVERBIN)/cgi-bin; \ | |
93 | done | |
d1d5300a | 94 | |
bfb43493 | 95 | |
168d236f | 96 | diff -Nur cups-1.1.12/conf/Makefile cups-1.1.12-new/conf/Makefile |
97 | --- cups-1.1.12/conf/Makefile Wed Jun 27 23:53:08 2001 | |
98 | +++ cups-1.1.12-new/conf/Makefile Sat Nov 24 20:27:51 2001 | |
99 | @@ -51,19 +51,12 @@ | |
d1d5300a | 100 | # |
101 | ||
102 | install: | |
103 | - $(INSTALL_DIR) $(SERVERROOT) | |
104 | + $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT) | |
105 | for file in $(KEEP); do \ | |
106 | - if test -r $(SERVERROOT)/$$file ; then \ | |
107 | - $(INSTALL_DATA) $$file $(SERVERROOT)/$$file.N ; \ | |
168d236f | 108 | - else \ |
d1d5300a | 109 | - $(INSTALL_DATA) $$file $(SERVERROOT) ; \ |
168d236f | 110 | - fi ; \ |
111 | + $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT) ; \ | |
d1d5300a | 112 | done |
113 | for file in $(REPLACE); do \ | |
114 | - if test -r $(SERVERROOT)/$$file ; then \ | |
115 | - $(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \ | |
168d236f | 116 | - fi ; \ |
d1d5300a | 117 | - $(INSTALL_DATA) $$file $(SERVERROOT) ; \ |
118 | + $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT) ; \ | |
119 | done | |
120 | ||
121 | ||
168d236f | 122 | diff -Nur cups-1.1.12/cups/Makefile cups-1.1.12-new/cups/Makefile |
123 | --- cups-1.1.12/cups/Makefile Tue Oct 30 21:37:14 2001 | |
124 | +++ cups-1.1.12-new/cups/Makefile Sat Nov 24 20:32:04 2001 | |
125 | @@ -68,25 +68,14 @@ | |
d1d5300a | 126 | # |
127 | ||
168d236f | 128 | install: all |
129 | - $(INSTALL_DIR) $(INCLUDEDIR)/cups | |
130 | + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/cups | |
131 | for file in $(HEADERS); do \ | |
132 | - $(INSTALL_DATA) $$file $(INCLUDEDIR)/cups; \ | |
133 | + $(INSTALL_DATA) $$file $(DESTDIR)$(INCLUDEDIR)/cups; \ | |
134 | done | |
d1d5300a | 135 | - $(INSTALL_DIR) $(LIBDIR) |
136 | - $(INSTALL_LIB) $(LIBCUPS) $(LIBDIR) | |
168d236f | 137 | - if test $(LIBCUPS) = "libcups.so.2" -o $(LIBCUPS) = "libcups.sl.2"; then \ |
138 | - $(INSTALL_LIB) libcups.a $(LIBDIR); \ | |
bfb43493 | 139 | - $(RM) $(LIBDIR)/`basename $(LIBCUPS) .2`; \ |
140 | - $(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \ | |
168d236f | 141 | - fi |
142 | - if test $(LIBCUPS) = "libcups.2.dylib"; then \ | |
143 | - $(INSTALL_LIB) libcups.a $(LIBDIR); \ | |
fb198dce | 144 | - $(RM) $(LIBDIR)/libcups.dylib; \ |
145 | - $(LN) $(LIBCUPS) $(LIBDIR)/libcups.dylib; \ | |
168d236f | 146 | - fi |
147 | - if test $(LIBCUPS) = "libcups_s.a"; then \ | |
bfb43493 | 148 | - $(INSTALL_LIB) libcups.a $(LIBDIR); \ |
168d236f | 149 | - fi |
150 | + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) | |
151 | + $(INSTALL_LIB) $(LIBCUPS) $(DESTDIR)$(LIBDIR) | |
152 | + $(LN) $(LIBCUPS) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPS) .2` | |
153 | + $(INSTALL_LIB) libcups.a $(DESTDIR)$(LIBDIR) | |
d1d5300a | 154 | |
fb198dce | 155 | |
168d236f | 156 | # |
157 | --- cups-1.1.13/data/Makefile.orig Thu Jan 31 15:53:42 2002 | |
158 | +++ cups-1.1.13/data/Makefile Tue Feb 5 08:22:43 2002 | |
159 | @@ -85,27 +85,20 @@ | |
d1d5300a | 160 | # |
161 | ||
162 | install: | |
bfb43493 | 163 | - $(INSTALL_DIR) $(DATADIR)/banners |
164 | + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/banners | |
165 | for file in $(BANNERS); do \ | |
166 | - $(INSTALL_DATA) $$file $(DATADIR)/banners; \ | |
167 | + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/banners; \ | |
168 | done | |
169 | - $(INSTALL_DIR) $(DATADIR)/charsets | |
170 | + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/charsets | |
171 | for file in $(CHARSETS); do \ | |
172 | - $(INSTALL_DATA) $$file $(DATADIR)/charsets; \ | |
173 | + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/charsets; \ | |
174 | done | |
175 | - $(INSTALL_DIR) $(DATADIR)/data | |
176 | + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/data | |
177 | for file in $(DATAFILES); do \ | |
178 | - $(INSTALL_DATA) $$file $(DATADIR)/data; \ | |
179 | + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/data; \ | |
180 | done | |
168d236f | 181 | - -if test x$(PAMDIR) != x$(BUILDROOT); then \ |
182 | - $(INSTALL_DIR) $(PAMDIR); \ | |
183 | - if test -f /lib/security/pam_unix.so; then \ | |
184 | - $(INSTALL_DATA) cups.suse $(PAMDIR)/cups; \ | |
185 | - else \ | |
186 | - $(INSTALL_DATA) cups.pam $(PAMDIR)/cups; \ | |
187 | - fi \ | |
188 | - fi | |
189 | - | |
190 | + $(INSTALL_DIR) $(DESTDIR)$(PAMDIR) | |
191 | + $(INSTALL_DATA) cups.pam $(DESTDIR)$(PAMDIR)/cups | |
d1d5300a | 192 | |
d1d5300a | 193 | # |
168d236f | 194 | # End of "$Id$". |
195 | diff -Nur cups-1.1.12/doc/Makefile cups-1.1.12-new/doc/Makefile | |
196 | --- cups-1.1.12/doc/Makefile Thu Jul 19 22:17:53 2001 | |
197 | +++ cups-1.1.12-new/doc/Makefile Sat Nov 24 20:27:51 2001 | |
198 | @@ -118,21 +118,21 @@ | |
71bac56b AF |
199 | # |
200 | ||
201 | install: | |
202 | - $(INSTALL_DIR) $(DOCDIR) | |
203 | + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR) | |
204 | for file in $(WEBPAGES); do \ | |
205 | - $(INSTALL_MAN) $$file $(DOCDIR); \ | |
206 | + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \ | |
207 | done | |
208 | - $(INSTALL_MAN) overview.html $(DOCDIR) | |
209 | - $(INSTALL_MAN) overview.pdf $(DOCDIR) | |
210 | + $(INSTALL_MAN) overview.html $(DESTDIR)$(DOCDIR) | |
211 | + $(INSTALL_MAN) overview.pdf $(DESTDIR)$(DOCDIR) | |
212 | for file in $(DOCUMENTS:.shtml=.html); do \ | |
213 | - $(INSTALL_MAN) $$file $(DOCDIR); \ | |
214 | + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \ | |
215 | done | |
216 | for file in $(DOCUMENTS:.shtml=.pdf); do \ | |
217 | - $(INSTALL_MAN) $$file $(DOCDIR); \ | |
218 | + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \ | |
219 | done | |
220 | - $(INSTALL_DIR) $(DOCDIR)/images | |
221 | + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/images | |
222 | for file in $(WEBIMAGES) $(DOCIMAGES); do \ | |
223 | - $(INSTALL_MAN) $$file $(DOCDIR)/images; \ | |
224 | + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/images; \ | |
225 | done | |
71bac56b | 226 | |
168d236f | 227 | |
228 | --- cups-1.1.13/filter/Makefile.orig Wed Jan 23 23:30:42 2002 | |
229 | +++ cups-1.1.13/filter/Makefile Tue Feb 5 08:25:37 2002 | |
230 | @@ -59,24 +59,15 @@ | |
d5b299a2 AM |
231 | # |
232 | ||
168d236f | 233 | install: |
bfb43493 | 234 | - $(INSTALL_DIR) $(SERVERBIN)/filter |
235 | + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/filter | |
236 | for file in $(TARGETS); do \ | |
237 | - $(INSTALL_BIN) $$file $(SERVERBIN)/filter; \ | |
238 | + $(INSTALL_BIN) $$file $(DESTDIR)$(SERVERBIN)/filter; \ | |
239 | done | |
d1d5300a | 240 | - $(INSTALL_DIR) $(LIBDIR) |
241 | - $(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR) | |
168d236f | 242 | - -if test $(LIBCUPSIMAGE) = "libcupsimage.so.2" -o $(LIBCUPSIMAGE) = "libcupsimage.sl.2"; then \ |
bfb43493 | 243 | - $(RM) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \ |
244 | - $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \ | |
168d236f | 245 | - fi |
246 | - -if test $(LIBCUPSIMAGE) = "libcupsimage.2.dylib"; then \ | |
fb198dce | 247 | - $(RM) $(LIBDIR)/libcupsimage.dylib; \ |
248 | - $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/libcupsimage.dylib; \ | |
168d236f | 249 | - fi |
d1d5300a | 250 | - $(INSTALL_DIR) $(INCLUDEDIR)/cups |
23db0460 | 251 | - $(INSTALL_DATA) image.h $(INCLUDEDIR)/cups |
d1d5300a | 252 | - $(INSTALL_DATA) raster.h $(INCLUDEDIR)/cups |
168d236f | 253 | - |
254 | + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) | |
255 | + $(INSTALL_LIB) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR) | |
256 | + $(LN) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \ | |
d1d5300a | 257 | + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/cups |
168d236f | 258 | + $(INSTALL_DATA) image.h raster.h $(DESTDIR)$(INCLUDEDIR)/cups |
fb198dce | 259 | |
d1d5300a | 260 | # |
168d236f | 261 | # formtops |
262 | diff -Nur cups-1.1.12/fonts/Makefile cups-1.1.12-new/fonts/Makefile | |
263 | --- cups-1.1.12/fonts/Makefile Thu Jul 19 22:17:55 2001 | |
264 | +++ cups-1.1.12-new/fonts/Makefile Sat Nov 24 20:27:51 2001 | |
265 | @@ -64,9 +64,9 @@ | |
d1d5300a | 266 | # |
267 | ||
268 | install: | |
bfb43493 | 269 | - $(INSTALL_DIR) $(DATADIR)/fonts |
270 | + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/fonts | |
271 | for file in $(FONTS); do \ | |
272 | - $(INSTALL_DATA) $$file $(DATADIR)/fonts; \ | |
273 | + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/fonts; \ | |
274 | done | |
d1d5300a | 275 | |
276 | ||
168d236f | 277 | diff -Nur cups-1.1.12/locale/Makefile cups-1.1.12-new/locale/Makefile |
278 | --- cups-1.1.12/locale/Makefile Tue Oct 23 19:20:23 2001 | |
279 | +++ cups-1.1.12-new/locale/Makefile Sat Nov 24 20:27:51 2001 | |
280 | @@ -50,10 +50,10 @@ | |
d1d5300a | 281 | # |
282 | ||
283 | install: | |
284 | - $(INSTALL_DIR) $(LOCALEDIR) | |
285 | + $(INSTALL_DIR) $(DESTDIR)$(LOCALEDIR) | |
286 | for dir in $(LOCALES) ; do \ | |
287 | - $(INSTALL_DIR) $(LOCALEDIR)/$$dir ; \ | |
288 | - $(INSTALL_DATA) $$dir/cups_$$dir $(LOCALEDIR)/$$dir ; \ | |
289 | + $(INSTALL_DIR) $(DESTDIR)$(LOCALEDIR)/$$dir ; \ | |
290 | + $(INSTALL_DATA) $$dir/cups_$$dir $(DESTDIR)$(LOCALEDIR)/$$dir ; \ | |
291 | done | |
292 | ||
293 | ||
168d236f | 294 | diff -Nur cups-1.1.12/man/Makefile cups-1.1.12-new/man/Makefile |
295 | --- cups-1.1.12/man/Makefile Fri Oct 26 05:16:48 2001 | |
296 | +++ cups-1.1.12-new/man/Makefile Sat Nov 24 20:48:12 2001 | |
297 | @@ -63,50 +63,25 @@ | |
71bac56b AF |
298 | # |
299 | ||
168d236f | 300 | install: |
71bac56b AF |
301 | - $(INSTALL_DIR) $(MANDIR)/man1 |
302 | + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1 | |
303 | for file in $(MAN1); do \ | |
304 | - $(INSTALL_MAN) $$file $(MANDIR)/man1/`basename $$file man`1; \ | |
305 | + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/man1/`basename $$file man`1; \ | |
306 | done | |
307 | - $(RM) $(MANDIR)/man1/cancel.1 | |
308 | - $(LN) lp.1 $(MANDIR)/man1/cancel.1 | |
309 | - $(INSTALL_DIR) $(PMANDIR)/man3 | |
71bac56b AF |
310 | + $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/man3 |
311 | for file in $(MAN3); do \ | |
312 | - $(INSTALL_MAN) $$file $(PMANDIR)/man3/`basename $$file man`3; \ | |
168d236f | 313 | + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/man3/`basename $$file man`3; \ |
71bac56b AF |
314 | done |
315 | - $(INSTALL_DIR) $(MANDIR)/man5 | |
168d236f | 316 | + $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/man5 |
71bac56b AF |
317 | for file in $(MAN5); do \ |
318 | - $(INSTALL_MAN) $$file $(MANDIR)/man5/`basename $$file man`5; \ | |
319 | + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/man5/`basename $$file man`5; \ | |
320 | done | |
321 | - $(INSTALL_DIR) $(AMANDIR)/man$(MAN8EXT) | |
168d236f | 322 | + $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/man8 |
71bac56b AF |
323 | for file in $(MAN8); do \ |
324 | - $(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \ | |
325 | + $(INSTALL_MAN) $$file $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \ | |
326 | done | |
327 | - $(RM) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT) | |
328 | - $(LN) accept.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT) | |
329 | - $(RM) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT) | |
330 | - $(LN) enable.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT) | |
331 | - $(INSTALL_DIR) $(MANDIR)/cat1 | |
168d236f | 332 | - for file in $(CAT1); do \ |
71bac56b | 333 | - $(INSTALL_MAN) $$file $(MANDIR)/cat1; \ |
168d236f | 334 | - done |
71bac56b AF |
335 | - $(RM) $(MANDIR)/cat1/cancel.$(CAT1EXT) |
336 | - $(LN) lp.$(CAT1EXT) $(MANDIR)/cat1/cancel.$(CAT1EXT) | |
337 | - $(INSTALL_DIR) $(PMANDIR)/cat3 | |
168d236f | 338 | - for file in $(CAT3); do \ |
71bac56b | 339 | - $(INSTALL_MAN) $$file $(PMANDIR)/cat3; \ |
168d236f | 340 | - done |
71bac56b | 341 | - $(INSTALL_DIR) $(MANDIR)/cat5 |
168d236f | 342 | - for file in $(CAT5); do \ |
71bac56b | 343 | - $(INSTALL_MAN) $$file $(MANDIR)/cat5; \ |
168d236f | 344 | - done |
71bac56b | 345 | - $(INSTALL_DIR) $(AMANDIR)/cat$(MAN8EXT) |
168d236f | 346 | - for file in $(CAT8); do \ |
71bac56b | 347 | - $(INSTALL_MAN) $$file $(AMANDIR)/cat$(MAN8EXT); \ |
168d236f | 348 | - done |
71bac56b AF |
349 | - $(RM) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT) |
350 | - $(LN) accept.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT) | |
351 | - $(RM) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT) | |
352 | - $(LN) enable.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT) | |
168d236f | 353 | + echo ".so accept.$(MAN8EXT)" > $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT) |
354 | + echo ".so enable.$(MAN8EXT)" > $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT) | |
355 | + | |
356 | ||
357 | ||
358 | # | |
359 | diff -Nur cups-1.1.12/pdftops/Makefile cups-1.1.12-new/pdftops/Makefile | |
360 | --- cups-1.1.12/pdftops/Makefile Wed Jun 27 23:53:16 2001 | |
361 | +++ cups-1.1.12-new/pdftops/Makefile Sat Nov 24 20:27:51 2001 | |
362 | @@ -43,8 +43,8 @@ | |
d1d5300a | 363 | # |
364 | ||
168d236f | 365 | install: |
d1d5300a | 366 | - $(INSTALL_DIR) $(SERVERBIN)/filter |
367 | - $(INSTALL_BIN) pdftops $(SERVERBIN)/filter | |
368 | + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/filter | |
369 | + $(INSTALL_BIN) pdftops $(DESTDIR)$(SERVERBIN)/filter | |
370 | ||
371 | ||
372 | # | |
168d236f | 373 | diff -Nur cups-1.1.12/ppd/Makefile cups-1.1.12-new/ppd/Makefile |
374 | --- cups-1.1.12/ppd/Makefile Thu Jul 19 22:17:56 2001 | |
375 | +++ cups-1.1.12-new/ppd/Makefile Sat Nov 24 20:27:51 2001 | |
bfb43493 | 376 | @@ -52,9 +52,9 @@ |
d1d5300a | 377 | # |
378 | ||
379 | install: | |
bfb43493 | 380 | - $(INSTALL_DIR) $(DATADIR)/model |
381 | + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/model | |
382 | for file in $(FILES); do \ | |
383 | - $(INSTALL_DATA) $$file $(DATADIR)/model; \ | |
384 | + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/model; \ | |
385 | done | |
386 | ||
387 | ||
168d236f | 388 | diff -Nur cups-1.1.12/pstoraster/Makefile cups-1.1.12-new/pstoraster/Makefile |
389 | --- cups-1.1.12/pstoraster/Makefile Wed Oct 31 17:18:33 2001 | |
390 | +++ cups-1.1.12-new/pstoraster/Makefile Sat Nov 24 20:27:51 2001 | |
391 | @@ -376,11 +376,11 @@ | |
d1d5300a | 392 | # |
bfb43493 | 393 | |
168d236f | 394 | install: $(TARGETS) |
395 | - $(INSTALL_DIR) $(SERVERBIN)/filter | |
396 | - $(INSTALL_BIN) pstoraster $(SERVERBIN)/filter | |
397 | - $(INSTALL_DIR) $(DATADIR)/pstoraster | |
398 | + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/filter | |
399 | + $(INSTALL_BIN) pstoraster $(DESTDIR)$(SERVERBIN)/filter | |
400 | + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/pstoraster | |
401 | for file in $(DFILES); do \ | |
402 | - $(INSTALL_DATA) $$file $(DATADIR)/pstoraster; \ | |
403 | + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/pstoraster; \ | |
404 | done | |
405 | ||
406 | ||
407 | diff -Nur cups-1.1.12/scheduler/Makefile cups-1.1.12-new/scheduler/Makefile | |
408 | --- cups-1.1.12/scheduler/Makefile Mon Jul 23 20:48:52 2001 | |
409 | +++ cups-1.1.12-new/scheduler/Makefile Sat Nov 24 20:27:51 2001 | |
410 | @@ -52,17 +52,17 @@ | |
411 | # | |
412 | ||
413 | install: | |
bfb43493 | 414 | - $(INSTALL_DIR) $(SBINDIR) |
415 | - $(INSTALL_BIN) cupsd $(SBINDIR) | |
416 | - $(INSTALL_DIR) $(SERVERBIN)/daemon | |
417 | - $(INSTALL_BIN) cups-lpd $(SERVERBIN)/daemon | |
418 | - $(INSTALL_BIN) cups-polld $(SERVERBIN)/daemon | |
168d236f | 419 | - $(INSTALL_DIR) -m 711 -o $(CUPS_USER) -g $(CUPS_GROUP) $(SERVERROOT)/certs |
bfb43493 | 420 | - $(INSTALL_DIR) $(SERVERROOT)/interfaces |
421 | - $(INSTALL_DIR) $(SERVERROOT)/ppd | |
422 | - $(INSTALL_DIR) $(LOGDIR) | |
168d236f | 423 | - $(INSTALL_DIR) -m 700 -o $(CUPS_USER) -g $(CUPS_GROUP) $(REQUESTS) |
424 | - $(INSTALL_DIR) -m 1700 -o $(CUPS_USER) -g $(CUPS_GROUP) $(REQUESTS)/tmp | |
bfb43493 | 425 | + $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) |
426 | + $(INSTALL_BIN) cupsd $(DESTDIR)$(SBINDIR) | |
427 | + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/daemon | |
428 | + $(INSTALL_BIN) cups-lpd $(DESTDIR)$(SERVERBIN)/daemon | |
429 | + $(INSTALL_BIN) cups-polld $(DESTDIR)$(SERVERBIN)/daemon | |
168d236f | 430 | + $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/certs |
bfb43493 | 431 | + $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/interfaces |
432 | + $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/ppd | |
433 | + $(INSTALL_DIR) $(DESTDIR)$(LOGDIR) | |
168d236f | 434 | + $(INSTALL_DIR) $(DESTDIR)$(REQUESTS) |
435 | + $(INSTALL_DIR) $(DESTDIR)$(REQUESTS)/tmp | |
bfb43493 | 436 | |
437 | ||
438 | # | |
168d236f | 439 | diff -Nur cups-1.1.12/systemv/Makefile cups-1.1.12-new/systemv/Makefile |
440 | --- cups-1.1.12/systemv/Makefile Tue Sep 18 21:14:47 2001 | |
441 | +++ cups-1.1.12-new/systemv/Makefile Sat Nov 24 20:39:57 2001 | |
442 | @@ -50,23 +50,20 @@ | |
bfb43493 | 443 | # |
444 | ||
168d236f | 445 | install: |
446 | - $(INSTALL_DIR) $(BINDIR) | |
bfb43493 | 447 | - $(INSTALL_BIN) accept $(SBINDIR) |
448 | - $(RM) $(SBINDIR)/reject | |
449 | - $(LN) accept $(SBINDIR)/reject | |
fb198dce | 450 | - $(INSTALL_BIN) cupsaddsmb $(SBINDIR) |
bfb43493 | 451 | - $(INSTALL_BIN) lpadmin $(SBINDIR) |
452 | - $(INSTALL_BIN) lpinfo $(SBINDIR) | |
453 | - $(INSTALL_BIN) lpmove $(SBINDIR) | |
454 | - $(INSTALL_BIN) cancel $(BINDIR) | |
455 | - $(RM) $(BINDIR)/disable | |
456 | - $(LN) ../sbin/accept $(BINDIR)/disable | |
457 | - $(RM) $(BINDIR)/enable | |
458 | - $(LN) ../sbin/accept $(BINDIR)/enable | |
459 | - $(INSTALL_BIN) lp $(BINDIR) | |
460 | - $(INSTALL_BIN) lpoptions $(BINDIR) | |
461 | - $(INSTALL_BIN) lpstat $(BINDIR) | |
168d236f | 462 | - $(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR) |
463 | + $(INSTALL_DIR) $(DESTDIR)$(BINDIR) | |
bfb43493 | 464 | + $(INSTALL_BIN) accept $(DESTDIR)$(SBINDIR) |
168d236f | 465 | + $(LN) -sf accept $(DESTDIR)$(SBINDIR)/reject |
fb198dce | 466 | + $(INSTALL_BIN) cupsaddsmb $(DESTDIR)$(SBINDIR) |
bfb43493 | 467 | + $(INSTALL_BIN) lpadmin $(DESTDIR)$(SBINDIR) |
468 | + $(INSTALL_BIN) lpinfo $(DESTDIR)$(SBINDIR) | |
469 | + $(INSTALL_BIN) lpmove $(DESTDIR)$(SBINDIR) | |
470 | + $(INSTALL_BIN) cancel $(DESTDIR)$(BINDIR) | |
168d236f | 471 | + $(LN) -sf ../sbin/accept $(DESTDIR)$(BINDIR)/disable |
472 | + $(LN) -sf ../sbin/accept $(DESTDIR)$(BINDIR)/enable | |
bfb43493 | 473 | + $(INSTALL_BIN) lp $(DESTDIR)$(BINDIR) |
474 | + $(INSTALL_BIN) lpoptions $(DESTDIR)$(BINDIR) | |
475 | + $(INSTALL_BIN) lpstat $(DESTDIR)$(BINDIR) | |
476 | + $(INSTALL_BIN) lppasswd $(DESTDIR)$(BINDIR) | |
477 | ||
478 | ||
479 | # | |
168d236f | 480 | diff -Nur cups-1.1.12/templates/Makefile cups-1.1.12-new/templates/Makefile |
481 | --- cups-1.1.12/templates/Makefile Mon Sep 24 19:51:16 2001 | |
482 | +++ cups-1.1.12-new/templates/Makefile Sat Nov 24 20:27:51 2001 | |
483 | @@ -92,9 +92,9 @@ | |
d5b299a2 AM |
484 | # |
485 | ||
486 | install: | |
71bac56b AF |
487 | - $(INSTALL_DIR) $(DATADIR)/templates |
488 | + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/templates | |
d5b299a2 | 489 | for file in $(FILES); do \ |
71bac56b AF |
490 | - $(INSTALL_DATA) $$file $(DATADIR)/templates; \ |
491 | + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/templates; \ | |
d5b299a2 | 492 | done |
d1d5300a | 493 | |
494 |