1 --- cups-1.1.18/backend/Makefile.wiget Tue Dec 17 19:56:33 2002
2 +++ cups-1.1.18/backend/Makefile Fri Dec 20 16:50:53 2002
7 - $(INSTALL_DIR) $(SERVERBIN)/backend
8 + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/backend
9 for file in $(BACKENDS); do \
10 - $(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
11 + $(INSTALL_BIN) $$file $(DESTDIR)$(SERVERBIN)/backend; \
13 - $(RM) $(SERVERBIN)/backend/http
14 - $(LN) ipp $(SERVERBIN)/backend/http
15 + $(RM) $(DESTDIR)$(SERVERBIN)/backend/http
16 + $(LN) ipp $(DESTDIR)$(SERVERBIN)/backend/http
20 --- cups-1.1.18/berkeley/Makefile.wiget Tue Dec 17 19:56:34 2002
21 +++ cups-1.1.18/berkeley/Makefile Fri Dec 20 16:50:53 2002
26 - $(INSTALL_DIR) $(BINDIR)
27 - $(INSTALL_BIN) lpq $(BINDIR)
28 - $(INSTALL_BIN) lpr $(BINDIR)
29 - $(INSTALL_BIN) lprm $(BINDIR)
30 - $(INSTALL_DIR) $(SBINDIR)
31 - $(INSTALL_BIN) lpc $(SBINDIR)
32 + $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
33 + $(INSTALL_BIN) lpq $(DESTDIR)$(BINDIR)
34 + $(INSTALL_BIN) lpr $(DESTDIR)$(BINDIR)
35 + $(INSTALL_BIN) lprm $(DESTDIR)$(BINDIR)
36 + $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
37 + $(INSTALL_BIN) lpc $(DESTDIR)$(SBINDIR)
41 --- cups-1.1.18/cgi-bin/Makefile.wiget Tue Dec 17 19:56:36 2002
42 +++ cups-1.1.18/cgi-bin/Makefile Fri Dec 20 16:50:53 2002
47 - $(INSTALL_DIR) $(SERVERBIN)/cgi-bin
48 + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/cgi-bin
49 for file in $(CGIS); do \
50 - $(INSTALL_BIN) $$file $(SERVERBIN)/cgi-bin; \
51 + $(INSTALL_BIN) $$file $(DESTDIR)$(SERVERBIN)/cgi-bin; \
55 --- cups-1.1.18/conf/Makefile.wiget Tue Dec 17 19:56:37 2002
56 +++ cups-1.1.18/conf/Makefile Fri Dec 20 16:50:53 2002
61 - $(INSTALL_DIR) $(SERVERROOT)
62 + $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)
63 for file in $(KEEP); do \
64 - if test -r $(SERVERROOT)/$$file ; then \
65 - $(INSTALL_DATA) $$file $(SERVERROOT)/$$file.N ; \
66 + if test -r $(DESTDIR)$(SERVERROOT)/$$file ; then \
67 + $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT)/$$file.N ; \
69 - $(INSTALL_DATA) $$file $(SERVERROOT) ; \
70 + $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT) ; \
73 for file in $(REPLACE); do \
74 - if test -r $(SERVERROOT)/$$file ; then \
75 - $(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
76 + if test -r $(DESTDIR)$(SERVERROOT)/$$file ; then \
77 + $(MV) $(DESTDIR)$(SERVERROOT)/$$file $(DESTDIR)$(SERVERROOT)/$$file.O ; \
79 - $(INSTALL_DATA) $$file $(SERVERROOT) ; \
80 + $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT) ; \
82 -if test x$(PAMDIR) != x$(BUILDROOT); then \
83 - $(INSTALL_DIR) $(PAMDIR); \
84 - $(INSTALL_DATA) pam.conf $(PAMDIR)/cups; \
85 + $(INSTALL_DIR) $(DESTDIR)$(PAMDIR); \
86 + $(INSTALL_DATA) pam.conf $(DESTDIR)$(PAMDIR)/cups; \
90 --- cups-1.1.18/cups/Makefile.wiget Tue Dec 17 19:56:40 2002
91 +++ cups-1.1.18/cups/Makefile Fri Dec 20 16:50:53 2002
95 install: all installhdrs
96 - $(INSTALL_DIR) $(LIBDIR)
97 - $(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
98 + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
99 + $(INSTALL_LIB) $(LIBCUPS) $(DESTDIR)$(LIBDIR)
100 if test $(LIBCUPS) = "libcups.so.2" -o $(LIBCUPS) = "libcups.sl.2"; then \
101 - $(RM) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
102 - $(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
103 + $(RM) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPS) .2`; \
104 + $(LN) $(LIBCUPS) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPS) .2`; \
106 if test $(LIBCUPS) = "libcups.2.dylib"; then \
107 - $(STRIP) -x $(LIBDIR)/$(LIBCUPS); \
108 - $(RM) $(LIBDIR)/libcups.dylib; \
109 - $(LN) $(LIBCUPS) $(LIBDIR)/libcups.dylib; \
110 + $(STRIP) -x $(DESTDIR)$(LIBDIR)/$(LIBCUPS); \
111 + $(RM) $(DESTDIR)$(LIBDIR)/libcups.dylib; \
112 + $(LN) $(LIBCUPS) $(DESTDIR)$(LIBDIR)/libcups.dylib; \
114 if test $(LIBCUPS) != "libcups.a"; then \
115 - $(INSTALL_LIB) libcups.a $(LIBDIR); \
116 + $(INSTALL_LIB) libcups.a $(DESTDIR)$(LIBDIR); \
118 - $(RANLIB) $(LIBDIR)/libcups.a
119 + $(RANLIB) $(DESTDIR)$(LIBDIR)/libcups.a
122 - $(INSTALL_DIR) $(INCLUDEDIR)/cups
123 + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/cups
124 for file in $(HEADERS); do \
125 - $(INSTALL_DATA) $$file $(INCLUDEDIR)/cups; \
126 + $(INSTALL_DATA) $$file $(DESTDIR)$(INCLUDEDIR)/cups; \
130 --- cups-1.1.18/data/Makefile.wiget Tue Dec 17 19:56:46 2002
131 +++ cups-1.1.18/data/Makefile Fri Dec 20 16:50:53 2002
136 - $(INSTALL_DIR) $(DATADIR)/banners
137 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/banners
138 for file in $(BANNERS); do \
139 - $(INSTALL_DATA) $$file $(DATADIR)/banners; \
140 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/banners; \
142 - $(INSTALL_DIR) $(DATADIR)/charsets
143 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/charsets
144 for file in $(CHARSETS); do \
145 - $(INSTALL_DATA) $$file $(DATADIR)/charsets; \
146 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/charsets; \
148 - $(INSTALL_DIR) $(DATADIR)/data
149 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/data
150 for file in $(DATAFILES); do \
151 - $(INSTALL_DATA) $$file $(DATADIR)/data; \
152 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/data; \
156 --- cups-1.1.18/doc/fr/Makefile.wiget Tue Dec 17 19:57:51 2002
157 +++ cups-1.1.18/doc/fr/Makefile Fri Dec 20 16:50:53 2002
158 @@ -107,21 +107,21 @@
162 - $(INSTALL_DIR) $(DOCDIR)/fr
163 + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/fr
164 for file in $(WEBPAGES); do \
165 - $(INSTALL_MAN) $$file $(DOCDIR)/fr; \
166 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/fr; \
168 - $(INSTALL_MAN) overview.html $(DOCDIR)/fr
169 - $(INSTALL_MAN) overview.pdf $(DOCDIR)/fr
170 + $(INSTALL_MAN) overview.html $(DESTDIR)$(DOCDIR)/fr
171 + $(INSTALL_MAN) overview.pdf $(DESTDIR)$(DOCDIR)/fr
172 for file in $(DOCUMENTS:.shtml=.html); do \
173 - $(INSTALL_MAN) $$file $(DOCDIR)/fr; \
174 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/fr; \
176 for file in $(DOCUMENTS:.shtml=.pdf); do \
177 - $(INSTALL_MAN) $$file $(DOCDIR)/fr; \
178 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/fr; \
180 - $(INSTALL_DIR) $(DOCDIR)/fr/images
181 + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/fr/images
182 for file in $(WEBIMAGES); do \
183 - $(INSTALL_MAN) $$file $(DOCDIR)/fr/images; \
184 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/fr/images; \
188 --- cups-1.1.18/doc/Makefile.wiget Tue Dec 17 23:08:09 2002
189 +++ cups-1.1.18/doc/Makefile Fri Dec 20 16:50:53 2002
190 @@ -123,21 +123,21 @@
194 - $(INSTALL_DIR) $(DOCDIR)
195 + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
196 for file in $(WEBPAGES); do \
197 - $(INSTALL_MAN) $$file $(DOCDIR); \
198 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \
200 - $(INSTALL_MAN) overview.html $(DOCDIR)
201 - $(INSTALL_MAN) overview.pdf $(DOCDIR)
202 + $(INSTALL_MAN) overview.html $(DESTDIR)$(DOCDIR)
203 + $(INSTALL_MAN) overview.pdf $(DESTDIR)$(DOCDIR)
204 for file in $(DOCUMENTS:.shtml=.html); do \
205 - $(INSTALL_MAN) $$file $(DOCDIR); \
206 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \
208 for file in $(DOCUMENTS:.shtml=.pdf); do \
209 - $(INSTALL_MAN) $$file $(DOCDIR); \
210 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \
212 - $(INSTALL_DIR) $(DOCDIR)/images
213 + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/images
214 for file in $(WEBIMAGES) $(DOCIMAGES); do \
215 - $(INSTALL_MAN) $$file $(DOCDIR)/images; \
216 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/images; \
218 cd fr; $(MAKE) $(MFLAGS) install
220 --- cups-1.1.18/filter/Makefile.wiget Tue Dec 17 19:59:24 2002
221 +++ cups-1.1.18/filter/Makefile Fri Dec 20 16:50:53 2002
225 install: all installhdrs
226 - $(INSTALL_DIR) $(SERVERBIN)/filter
227 + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/filter
228 for file in $(TARGETS); do \
229 - $(INSTALL_BIN) $$file $(SERVERBIN)/filter; \
230 + $(INSTALL_BIN) $$file $(DESTDIR)$(SERVERBIN)/filter; \
232 - $(INSTALL_DIR) $(LIBDIR)
233 - $(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR)
234 + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
235 + $(INSTALL_LIB) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)
236 -if test $(LIBCUPSIMAGE) = "libcupsimage.so.2" -o $(LIBCUPSIMAGE) = "libcupsimage.sl.2"; then \
237 - $(RM) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
238 - $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
239 + $(RM) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
240 + $(LN) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
242 -if test $(LIBCUPSIMAGE) = "libcupsimage.2.dylib"; then \
243 - $(STRIP) -x $(LIBDIR)/$(LIBCUPSIMAGE); \
244 - $(RM) $(LIBDIR)/libcupsimage.dylib; \
245 - $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/libcupsimage.dylib; \
246 + $(STRIP) -x $(DESTDIR)$(LIBDIR)/$(LIBCUPSIMAGE); \
247 + $(RM) $(DESTDIR)$(LIBDIR)/libcupsimage.dylib; \
248 + $(LN) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)/libcupsimage.dylib; \
250 -if test $(LIBCUPSIMAGE) != "libcupsimage.a"; then \
251 - $(INSTALL_LIB) libcupsimage.a $(LIBDIR); \
252 + $(INSTALL_LIB) libcupsimage.a $(DESTDIR)$(LIBDIR); \
254 - $(RANLIB) $(LIBDIR)/libcupsimage.a
255 + $(RANLIB) $(DESTDIR)$(LIBDIR)/libcupsimage.a
258 - $(INSTALL_DIR) $(INCLUDEDIR)/cups
259 - $(INSTALL_DATA) image.h $(INCLUDEDIR)/cups
260 - $(INSTALL_DATA) raster.h $(INCLUDEDIR)/cups
261 + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/cups
262 + $(INSTALL_DATA) image.h $(DESTDIR)$(INCLUDEDIR)/cups
263 + $(INSTALL_DATA) raster.h $(DESTDIR)$(INCLUDEDIR)/cups
267 --- cups-1.1.18/fonts/Makefile.wiget Tue Dec 17 19:59:31 2002
268 +++ cups-1.1.18/fonts/Makefile Fri Dec 20 16:50:53 2002
273 - $(INSTALL_DIR) $(DATADIR)/fonts
274 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/fonts
275 for file in $(FONTS); do \
276 - $(INSTALL_DATA) $$file $(DATADIR)/fonts; \
277 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/fonts; \
281 --- cups-1.1.18/locale/Makefile.wiget Tue Dec 17 19:59:44 2002
282 +++ cups-1.1.18/locale/Makefile Fri Dec 20 16:50:53 2002
287 - $(INSTALL_DIR) $(LOCALEDIR)
288 + $(INSTALL_DIR) $(DESTDIR)$(LOCALEDIR)
289 for dir in $(LOCALES) ; do \
290 - $(INSTALL_DIR) $(LOCALEDIR)/$$dir ; \
291 - $(INSTALL_DATA) $$dir/cups_$$dir $(LOCALEDIR)/$$dir ; \
292 + $(INSTALL_DIR) $(DESTDIR)$(LOCALEDIR)/$$dir ; \
293 + $(INSTALL_DATA) $$dir/cups_$$dir $(DESTDIR)$(LOCALEDIR)/$$dir ; \
297 --- cups-1.1.18/man/fr/Makefile.wiget Tue Dec 17 19:59:59 2002
298 +++ cups-1.1.18/man/fr/Makefile Fri Dec 20 16:50:54 2002
303 - $(INSTALL_DIR) $(MANDIR)/$(LANGUAGE)/man1
304 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man1
305 for file in $(MAN1); do \
306 - $(INSTALL_MAN) $$file $(MANDIR)/$(LANGUAGE)/man1/`basename $$file man`1; \
307 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man1/`basename $$file man`1; \
309 - $(RM) $(MANDIR)/$(LANGUAGE)/man1/cancel.1
310 - $(LN) lp.1 $(MANDIR)/$(LANGUAGE)/man1/cancel.1
311 - $(INSTALL_DIR) $(PMANDIR)/fr/man3
312 + $(RM) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man1/cancel.1
313 + $(LN) lp.1 $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man1/cancel.1
314 + $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/fr/man3
315 for file in $(MAN3); do \
316 - $(INSTALL_MAN) $$file $(PMANDIR)/fr/man3/`basename $$file man`3; \
317 + $(INSTALL_MAN) $$file $(DESTDIR)$(PMANDIR)/fr/man3/`basename $$file man`3; \
319 - $(INSTALL_DIR) $(MANDIR)/$(LANGUAGE)/man5
320 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man5
321 for file in $(MAN5); do \
322 - $(INSTALL_MAN) $$file $(MANDIR)/$(LANGUAGE)/man5/`basename $$file man`5; \
323 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man5/`basename $$file man`5; \
325 - $(INSTALL_DIR) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)
326 + $(INSTALL_DIR) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)
327 for file in $(MAN8); do \
328 - $(INSTALL_MAN) $$file $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
329 + $(INSTALL_MAN) $$file $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
331 - $(RM) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/reject.$(MAN8EXT)
332 - $(LN) accept.$(MAN8EXT) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/reject.$(MAN8EXT)
333 - $(RM) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/disable.$(MAN8EXT)
334 - $(LN) enable.$(MAN8EXT) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/disable.$(MAN8EXT)
335 - $(INSTALL_DIR) $(MANDIR)/$(LANGUAGE)/cat1
336 + $(RM) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/reject.$(MAN8EXT)
337 + $(LN) accept.$(MAN8EXT) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/reject.$(MAN8EXT)
338 + $(RM) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/disable.$(MAN8EXT)
339 + $(LN) enable.$(MAN8EXT) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/disable.$(MAN8EXT)
340 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat1
341 for file in $(CAT1); do \
342 - $(INSTALL_MAN) $$file $(MANDIR)/$(LANGUAGE)/cat1; \
343 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat1; \
345 - $(RM) $(MANDIR)/$(LANGUAGE)/cat1/cancel.$(CAT1EXT)
346 - $(LN) lp.$(CAT1EXT) $(MANDIR)/$(LANGUAGE)/cat1/cancel.$(CAT1EXT)
347 - $(INSTALL_DIR) $(PMANDIR)/fr/cat3
348 + $(RM) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat1/cancel.$(CAT1EXT)
349 + $(LN) lp.$(CAT1EXT) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat1/cancel.$(CAT1EXT)
350 + $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/fr/cat3
351 for file in $(CAT3); do \
352 - $(INSTALL_MAN) $$file $(PMANDIR)/fr/cat3; \
353 + $(INSTALL_MAN) $$file $(DESTDIR)$(PMANDIR)/fr/cat3; \
355 - $(INSTALL_DIR) $(MANDIR)/$(LANGUAGE)/cat5
356 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat5
357 for file in $(CAT5); do \
358 - $(INSTALL_MAN) $$file $(MANDIR)/$(LANGUAGE)/cat5; \
359 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat5; \
361 - $(INSTALL_DIR) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)
362 + $(INSTALL_DIR) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)
363 for file in $(CAT8); do \
364 - $(INSTALL_MAN) $$file $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT); \
365 + $(INSTALL_MAN) $$file $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT); \
367 - $(RM) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/reject.$(CAT8EXT)
368 - $(LN) accept.$(CAT8EXT) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/reject.$(CAT8EXT)
369 - $(RM) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/disable.$(CAT8EXT)
370 - $(LN) enable.$(CAT8EXT) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/disable.$(CAT8EXT)
371 + $(RM) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/reject.$(CAT8EXT)
372 + $(LN) accept.$(CAT8EXT) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/reject.$(CAT8EXT)
373 + $(RM) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/disable.$(CAT8EXT)
374 + $(LN) enable.$(CAT8EXT) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/disable.$(CAT8EXT)
378 --- cups-1.1.18/man/Makefile.wiget Tue Dec 17 19:59:55 2002
379 +++ cups-1.1.18/man/Makefile Fri Dec 20 16:50:54 2002
384 - $(INSTALL_DIR) $(MANDIR)/man1
385 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1
386 for file in $(MAN1); do \
387 - $(INSTALL_MAN) $$file $(MANDIR)/man1/`basename $$file man`1; \
388 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/man1/`basename $$file man`1; \
390 - $(RM) $(MANDIR)/man1/cancel.1
391 - $(LN) lp.1 $(MANDIR)/man1/cancel.1
392 - $(INSTALL_DIR) $(PMANDIR)/man3
393 + $(RM) $(DESTDIR)$(MANDIR)/man1/cancel.1
394 + $(LN) lp.1 $(DESTDIR)$(MANDIR)/man1/cancel.1
395 + $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/man3
396 for file in $(MAN3); do \
397 - $(INSTALL_MAN) $$file $(PMANDIR)/man3/`basename $$file man`3; \
398 + $(INSTALL_MAN) $$file $(DESTDIR)$(PMANDIR)/man3/`basename $$file man`3; \
400 - $(INSTALL_DIR) $(MANDIR)/man5
401 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man5
402 for file in $(MAN5); do \
403 - $(INSTALL_MAN) $$file $(MANDIR)/man5/`basename $$file man`5; \
404 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/man5/`basename $$file man`5; \
406 - $(INSTALL_DIR) $(AMANDIR)/man$(MAN8EXT)
407 + $(INSTALL_DIR) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)
408 for file in $(MAN8); do \
409 - $(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
410 + $(INSTALL_MAN) $$file $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
412 - $(RM) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
413 - $(LN) accept.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
414 - $(RM) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
415 - $(LN) enable.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
416 - $(INSTALL_DIR) $(MANDIR)/cat1
417 + $(RM) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
418 + $(LN) accept.$(MAN8EXT) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
419 + $(RM) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
420 + $(LN) enable.$(MAN8EXT) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
421 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/cat1
422 for file in $(CAT1); do \
423 - $(INSTALL_MAN) $$file $(MANDIR)/cat1; \
424 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/cat1; \
426 - $(RM) $(MANDIR)/cat1/cancel.$(CAT1EXT)
427 - $(LN) lp.$(CAT1EXT) $(MANDIR)/cat1/cancel.$(CAT1EXT)
428 - $(INSTALL_DIR) $(PMANDIR)/cat3
429 + $(RM) $(DESTDIR)$(MANDIR)/cat1/cancel.$(CAT1EXT)
430 + $(LN) lp.$(CAT1EXT) $(DESTDIR)$(MANDIR)/cat1/cancel.$(CAT1EXT)
431 + $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/cat3
432 for file in $(CAT3); do \
433 - $(INSTALL_MAN) $$file $(PMANDIR)/cat3; \
434 + $(INSTALL_MAN) $$file $(DESTDIR)$(PMANDIR)/cat3; \
436 - $(INSTALL_DIR) $(MANDIR)/cat5
437 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/cat5
438 for file in $(CAT5); do \
439 - $(INSTALL_MAN) $$file $(MANDIR)/cat5; \
440 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/cat5; \
442 - $(INSTALL_DIR) $(AMANDIR)/cat$(MAN8EXT)
443 + $(INSTALL_DIR) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)
444 for file in $(CAT8); do \
445 - $(INSTALL_MAN) $$file $(AMANDIR)/cat$(MAN8EXT); \
446 + $(INSTALL_MAN) $$file $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT); \
448 - $(RM) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
449 - $(LN) accept.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
450 - $(RM) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
451 - $(LN) enable.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
452 + $(RM) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
453 + $(LN) accept.$(CAT8EXT) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
454 + $(RM) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
455 + $(LN) enable.$(CAT8EXT) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
456 for dir in $(LANGDIRS); do \
457 echo "Installing all in man/$$dir..."; \
458 (cd $$dir; $(MAKE) $(MFLAGS) install); \
459 --- cups-1.1.18/pdftops/Makefile.wiget Tue Dec 17 20:00:04 2002
460 +++ cups-1.1.18/pdftops/Makefile Fri Dec 20 16:50:54 2002
465 - $(INSTALL_DIR) $(SERVERBIN)/filter
466 - $(INSTALL_BIN) pdftops $(SERVERBIN)/filter
467 + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/filter
468 + $(INSTALL_BIN) pdftops $(DESTDIR)$(SERVERBIN)/filter
472 --- cups-1.1.18/ppd/Makefile.wiget Tue Dec 17 20:00:06 2002
473 +++ cups-1.1.18/ppd/Makefile Fri Dec 20 16:50:54 2002
478 - $(INSTALL_DIR) $(DATADIR)/model
479 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/model
480 for file in $(FILES); do \
481 - $(INSTALL_DATA) $$file $(DATADIR)/model; \
482 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/model; \
486 --- cups-1.1.18/scheduler/Makefile.wiget Tue Dec 17 20:00:12 2002
487 +++ cups-1.1.18/scheduler/Makefile Fri Dec 20 16:50:54 2002
492 - $(INSTALL_DIR) $(SBINDIR)
493 - $(INSTALL_BIN) cupsd $(SBINDIR)
494 - $(INSTALL_DIR) $(SERVERBIN)/daemon
495 - $(INSTALL_BIN) cups-lpd $(SERVERBIN)/daemon
496 - $(INSTALL_BIN) cups-polld $(SERVERBIN)/daemon
497 - $(INSTALL_DIR) -m 711 $(SERVERROOT)/certs
498 - $(INSTALL_DIR) $(SERVERROOT)/interfaces
499 - $(INSTALL_DIR) $(SERVERROOT)/ppd
500 - $(INSTALL_DIR) $(LOGDIR)
501 - $(INSTALL_DIR) -m 700 $(REQUESTS)
502 - $(INSTALL_DIR) -m 1700 $(REQUESTS)/tmp
503 + $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
504 + $(INSTALL_BIN) cupsd $(DESTDIR)$(SBINDIR)
505 + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/daemon
506 + $(INSTALL_BIN) cups-lpd $(DESTDIR)$(SERVERBIN)/daemon
507 + $(INSTALL_BIN) cups-polld $(DESTDIR)$(SERVERBIN)/daemon
508 + $(INSTALL_DIR) -m 711 $(DESTDIR)$(SERVERROOT)/certs
509 + $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/interfaces
510 + $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/ppd
511 + $(INSTALL_DIR) $(DESTDIR)$(LOGDIR)
512 + $(INSTALL_DIR) -m 700 $(DESTDIR)$(REQUESTS)
513 + $(INSTALL_DIR) -m 1700 $(DESTDIR)$(REQUESTS)/tmp
517 --- cups-1.1.18/systemv/Makefile.wiget Tue Dec 17 20:00:19 2002
518 +++ cups-1.1.18/systemv/Makefile Fri Dec 20 16:53:10 2002
523 - $(INSTALL_DIR) $(SBINDIR)
524 - $(INSTALL_BIN) accept $(SBINDIR)
525 - $(RM) $(SBINDIR)/reject
526 - $(LN) accept $(SBINDIR)/reject
527 - $(INSTALL_BIN) cupsaddsmb $(SBINDIR)
528 - $(INSTALL_BIN) lpadmin $(SBINDIR)
529 - $(INSTALL_BIN) lpinfo $(SBINDIR)
530 - $(INSTALL_BIN) lpmove $(SBINDIR)
531 - $(INSTALL_DIR) $(BINDIR)
532 - $(INSTALL_BIN) cancel $(BINDIR)
533 - $(INSTALL_BIN) cupstestppd $(SBINDIR)
534 - $(RM) $(BINDIR)/disable
535 - $(LN) ../sbin/accept $(BINDIR)/disable
536 - $(RM) $(BINDIR)/enable
537 - $(LN) ../sbin/accept $(BINDIR)/enable
538 - $(INSTALL_BIN) lp $(BINDIR)
539 - $(INSTALL_BIN) lpoptions $(BINDIR)
540 - $(INSTALL_BIN) lpstat $(BINDIR)
541 - $(INSTALL_BIN) lppasswd $(BINDIR)
542 - -$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR)
543 + $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
544 + $(INSTALL_BIN) accept $(DESTDIR)$(SBINDIR)
545 + $(RM) $(DESTDIR)$(SBINDIR)/reject
546 + $(LN) accept $(DESTDIR)$(SBINDIR)/reject
547 + $(INSTALL_BIN) cupsaddsmb $(DESTDIR)$(SBINDIR)
548 + $(INSTALL_BIN) lpadmin $(DESTDIR)$(SBINDIR)
549 + $(INSTALL_BIN) lpinfo $(DESTDIR)$(SBINDIR)
550 + $(INSTALL_BIN) lpmove $(DESTDIR)$(SBINDIR)
551 + $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
552 + $(INSTALL_BIN) cancel $(DESTDIR)$(BINDIR)
553 + $(INSTALL_BIN) cupstestppd $(DESTDIR)$(SBINDIR)
554 + $(RM) $(DESTDIR)$(BINDIR)/disable
555 + $(LN) ../sbin/accept $(DESTDIR)$(BINDIR)/disable
556 + $(RM) $(DESTDIR)$(BINDIR)/enable
557 + $(LN) ../sbin/accept $(DESTDIR)$(BINDIR)/enable
558 + $(INSTALL_BIN) lp $(DESTDIR)$(BINDIR)
559 + $(INSTALL_BIN) lpoptions $(DESTDIR)$(BINDIR)
560 + $(INSTALL_BIN) lpstat $(DESTDIR)$(BINDIR)
561 + $(INSTALL_BIN) lppasswd $(DESTDIR)$(BINDIR)
562 + -$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(DESTDIR)$(BINDIR)
566 --- cups-1.1.18/templates/fr/Makefile.wiget Tue Dec 17 20:00:23 2002
567 +++ cups-1.1.18/templates/fr/Makefile Fri Dec 20 16:50:54 2002
572 - $(INSTALL_DIR) $(DATADIR)/templates/fr
573 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/templates/fr
574 for file in $(FILES); do \
575 - $(INSTALL_DATA) $$file $(DATADIR)/templates/fr; \
576 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/templates/fr; \
580 --- cups-1.1.18/templates/Makefile.wiget Tue Dec 17 20:00:22 2002
581 +++ cups-1.1.18/templates/Makefile Fri Dec 20 16:50:54 2002
586 - $(INSTALL_DIR) $(DATADIR)/templates
587 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/templates
588 for file in $(FILES); do \
589 - $(INSTALL_DATA) $$file $(DATADIR)/templates; \
590 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/templates; \
592 cd fr; $(MAKE) $(MFLAGS) install
594 --- cups-1.1.18/Makefile.wiget Tue Dec 17 19:56:25 2002
595 +++ cups-1.1.18/Makefile Fri Dec 20 16:50:54 2002
597 echo Installing in templates...
598 (cd templates; $(MAKE) $(MFLAGS) install)
599 echo Installing cups-config script...
600 - $(INSTALL_DIR) $(BINDIR)
601 - $(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
602 - echo Installing startup script...
603 - if test "x$(INITDIR)" != "x"; then \
604 - $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \
605 - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
606 - $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc0.d; \
607 - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
608 - $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc2.d; \
609 - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
610 - $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc3.d; \
611 - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
612 - $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc5.d; \
613 - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
615 - if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
616 - $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
617 - if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
618 - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/PrintingServices; \
619 - $(INSTALL_DATA) cups.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
620 - $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
621 - $(INSTALL_DATA) cups.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
623 - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
626 + $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
627 + $(INSTALL_SCRIPT) cups-config $(DESTDIR)$(BINDIR)/cups-config
630 # Install source and header files...