1 diff -Nur cups-1.1.12/Makefile cups-1.1.12-new/Makefile
2 --- cups-1.1.12/Makefile Tue Oct 30 21:37:13 2001
3 +++ cups-1.1.12-new/Makefile Sat Nov 24 20:53:48 2001
5 echo Installing in templates...
6 (cd templates; $(MAKE) $(MFLAGS) install)
7 echo Installing cups-config script...
8 - $(INSTALL_DIR) $(bindir)
9 - $(INSTALL_SCRIPT) cups-config $(bindir)/cups-config
10 - echo Installing startup script...
11 - if test "x$(INITDIR)" != "x"; then \
12 - $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \
13 - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
14 - $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc0.d; \
15 - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
16 - $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc2.d; \
17 - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
18 - $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc3.d; \
19 - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
20 - $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc5.d; \
21 - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
23 - if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
24 - $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
25 - if test "$(INITDDIR)" = "/System/Library/StartupItems/CUPS"; then \
26 - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/CUPS; \
27 - $(INSTALL_DATA) cups.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
28 - $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
29 - $(INSTALL_DATA) cups.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
31 - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
34 + $(INSTALL_DIR) $(DESTDIR)$(bindir)
35 + $(INSTALL_SCRIPT) cups-config $(DESTDIR)$(bindir)/cups-config
39 diff -Nur cups-1.1.12/backend/Makefile cups-1.1.12-new/backend/Makefile
40 --- cups-1.1.12/backend/Makefile Tue Jul 24 21:56:41 2001
41 +++ cups-1.1.12-new/backend/Makefile Sat Nov 24 20:27:51 2001
46 - $(INSTALL_DIR) $(SERVERBIN)/backend
47 + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/backend
48 for file in $(BACKENDS); do \
49 - $(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
50 + $(INSTALL_BIN) $$file $(DESTDIR)$(SERVERBIN)/backend; \
52 - $(RM) $(SERVERBIN)/backend/http
53 - $(LN) ipp $(SERVERBIN)/backend/http
54 + $(LN) -sf ipp $(DESTDIR)$(SERVERBIN)/backend/http
58 diff -Nur cups-1.1.12/berkeley/Makefile cups-1.1.12-new/berkeley/Makefile
59 --- cups-1.1.12/berkeley/Makefile Thu Jul 19 22:17:51 2001
60 +++ cups-1.1.12-new/berkeley/Makefile Sat Nov 24 20:27:51 2001
65 - $(INSTALL_DIR) $(BINDIR)
66 - $(INSTALL_BIN) lpq $(BINDIR)
67 - $(INSTALL_BIN) lpr $(BINDIR)
68 - $(INSTALL_BIN) lprm $(BINDIR)
69 - $(INSTALL_DIR) $(SBINDIR)
70 - $(INSTALL_BIN) lpc $(SBINDIR)
71 + $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
72 + $(INSTALL_BIN) lpq $(DESTDIR)$(BINDIR)
73 + $(INSTALL_BIN) lpr $(DESTDIR)$(BINDIR)
74 + $(INSTALL_BIN) lprm $(DESTDIR)$(BINDIR)
75 + $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
76 + $(INSTALL_BIN) lpc $(DESTDIR)$(SBINDIR)
80 diff -Nur cups-1.1.12/cgi-bin/Makefile cups-1.1.12-new/cgi-bin/Makefile
81 --- cups-1.1.12/cgi-bin/Makefile Thu Jul 19 22:17:51 2001
82 +++ cups-1.1.12-new/cgi-bin/Makefile Sat Nov 24 20:27:51 2001
87 - $(INSTALL_DIR) $(SERVERBIN)/cgi-bin
88 + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/cgi-bin
89 for file in $(CGIS); do \
90 - $(INSTALL_BIN) $$file $(SERVERBIN)/cgi-bin; \
91 + $(INSTALL_BIN) $$file $(DESTDIR)$(SERVERBIN)/cgi-bin; \
95 diff -Nur cups-1.1.12/conf/Makefile cups-1.1.12-new/conf/Makefile
96 --- cups-1.1.12/conf/Makefile Wed Jun 27 23:53:08 2001
97 +++ cups-1.1.12-new/conf/Makefile Sat Nov 24 20:27:51 2001
102 - $(INSTALL_DIR) $(SERVERROOT)
103 + $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)
104 for file in $(KEEP); do \
105 - if test -r $(SERVERROOT)/$$file ; then \
106 - $(INSTALL_DATA) $$file $(SERVERROOT)/$$file.N ; \
108 - $(INSTALL_DATA) $$file $(SERVERROOT) ; \
110 + $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT) ; \
112 for file in $(REPLACE); do \
113 - if test -r $(SERVERROOT)/$$file ; then \
114 - $(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
116 - $(INSTALL_DATA) $$file $(SERVERROOT) ; \
117 + $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT) ; \
121 diff -Nur cups-1.1.12/cups/Makefile cups-1.1.12-new/cups/Makefile
122 --- cups-1.1.12/cups/Makefile Tue Oct 30 21:37:14 2001
123 +++ cups-1.1.12-new/cups/Makefile Sat Nov 24 20:32:04 2001
128 - $(INSTALL_DIR) $(INCLUDEDIR)/cups
129 + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/cups
130 for file in $(HEADERS); do \
131 - $(INSTALL_DATA) $$file $(INCLUDEDIR)/cups; \
132 + $(INSTALL_DATA) $$file $(DESTDIR)$(INCLUDEDIR)/cups; \
134 - $(INSTALL_DIR) $(LIBDIR)
135 - $(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
136 - if test $(LIBCUPS) = "libcups.so.2" -o $(LIBCUPS) = "libcups.sl.2"; then \
137 - $(INSTALL_LIB) libcups.a $(LIBDIR); \
138 - $(RM) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
139 - $(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
141 - if test $(LIBCUPS) = "libcups.2.dylib"; then \
142 - $(INSTALL_LIB) libcups.a $(LIBDIR); \
143 - $(RM) $(LIBDIR)/libcups.dylib; \
144 - $(LN) $(LIBCUPS) $(LIBDIR)/libcups.dylib; \
146 - if test $(LIBCUPS) = "libcups_s.a"; then \
147 - $(INSTALL_LIB) libcups.a $(LIBDIR); \
149 + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
150 + $(INSTALL_LIB) $(LIBCUPS) $(DESTDIR)$(LIBDIR)
151 + $(LN) $(LIBCUPS) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPS) .2`
152 + $(INSTALL_LIB) libcups.a $(DESTDIR)$(LIBDIR)
156 diff -Nur cups-1.1.12/data/Makefile cups-1.1.12-new/data/Makefile
157 --- cups-1.1.12/data/Makefile Thu Jul 19 22:17:52 2001
158 +++ cups-1.1.12-new/data/Makefile Sat Nov 24 20:27:51 2001
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; \
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; \
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; \
181 - -if test x$(PAMDIR) != x; then \
182 - $(INSTALL_DIR) $(PAMDIR); \
183 - if test -f /lib/security/pam_unix.so; then \
184 - $(INSTALL_DATA) cups.suse $(PAMDIR)/cups; \
186 - $(INSTALL_DATA) cups.pam $(PAMDIR)/cups; \
189 + $(INSTALL_DIR) $(DESTDIR)$(PAMDIR)
190 + $(INSTALL_DATA) cups.pam $(DESTDIR)$(PAMDIR)/cups
194 diff -Nur cups-1.1.12/doc/Makefile cups-1.1.12-new/doc/Makefile
195 --- cups-1.1.12/doc/Makefile Thu Jul 19 22:17:53 2001
196 +++ cups-1.1.12-new/doc/Makefile Sat Nov 24 20:27:51 2001
197 @@ -118,21 +118,21 @@
201 - $(INSTALL_DIR) $(DOCDIR)
202 + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
203 for file in $(WEBPAGES); do \
204 - $(INSTALL_MAN) $$file $(DOCDIR); \
205 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \
207 - $(INSTALL_MAN) overview.html $(DOCDIR)
208 - $(INSTALL_MAN) overview.pdf $(DOCDIR)
209 + $(INSTALL_MAN) overview.html $(DESTDIR)$(DOCDIR)
210 + $(INSTALL_MAN) overview.pdf $(DESTDIR)$(DOCDIR)
211 for file in $(DOCUMENTS:.shtml=.html); do \
212 - $(INSTALL_MAN) $$file $(DOCDIR); \
213 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \
215 for file in $(DOCUMENTS:.shtml=.pdf); do \
216 - $(INSTALL_MAN) $$file $(DOCDIR); \
217 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \
219 - $(INSTALL_DIR) $(DOCDIR)/images
220 + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/images
221 for file in $(WEBIMAGES) $(DOCIMAGES); do \
222 - $(INSTALL_MAN) $$file $(DOCDIR)/images; \
223 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/images; \
227 diff -Nur cups-1.1.12/filter/Makefile cups-1.1.12-new/filter/Makefile
228 --- cups-1.1.12/filter/Makefile Sun Oct 7 14:16:09 2001
229 +++ cups-1.1.12-new/filter/Makefile Sat Nov 24 20:33:57 2001
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; \
240 - $(INSTALL_DIR) $(LIBDIR)
241 - $(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR)
242 - -if test $(LIBCUPSIMAGE) = "libcupsimage.so.2" -o $(LIBCUPSIMAGE) = "libcupsimage.sl.2"; then \
243 - $(RM) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
244 - $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
246 - -if test $(LIBCUPSIMAGE) = "libcupsimage.2.dylib"; then \
247 - $(RM) $(LIBDIR)/libcupsimage.dylib; \
248 - $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/libcupsimage.dylib; \
250 - $(INSTALL_DIR) $(INCLUDEDIR)/cups
251 - $(INSTALL_DATA) raster.h $(INCLUDEDIR)/cups
252 + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
253 + $(INSTALL_LIB) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)
254 + $(LN) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
255 + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/cups
256 + $(INSTALL_DATA) raster.h $(DESTDIR)$(INCLUDEDIR)/cups
260 diff -Nur cups-1.1.12/fonts/Makefile cups-1.1.12-new/fonts/Makefile
261 --- cups-1.1.12/fonts/Makefile Thu Jul 19 22:17:55 2001
262 +++ cups-1.1.12-new/fonts/Makefile Sat Nov 24 20:27:51 2001
267 - $(INSTALL_DIR) $(DATADIR)/fonts
268 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/fonts
269 for file in $(FONTS); do \
270 - $(INSTALL_DATA) $$file $(DATADIR)/fonts; \
271 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/fonts; \
275 diff -Nur cups-1.1.12/locale/Makefile cups-1.1.12-new/locale/Makefile
276 --- cups-1.1.12/locale/Makefile Tue Oct 23 19:20:23 2001
277 +++ cups-1.1.12-new/locale/Makefile Sat Nov 24 20:27:51 2001
282 - $(INSTALL_DIR) $(LOCALEDIR)
283 + $(INSTALL_DIR) $(DESTDIR)$(LOCALEDIR)
284 for dir in $(LOCALES) ; do \
285 - $(INSTALL_DIR) $(LOCALEDIR)/$$dir ; \
286 - $(INSTALL_DATA) $$dir/cups_$$dir $(LOCALEDIR)/$$dir ; \
287 + $(INSTALL_DIR) $(DESTDIR)$(LOCALEDIR)/$$dir ; \
288 + $(INSTALL_DATA) $$dir/cups_$$dir $(DESTDIR)$(LOCALEDIR)/$$dir ; \
292 diff -Nur cups-1.1.12/man/Makefile cups-1.1.12-new/man/Makefile
293 --- cups-1.1.12/man/Makefile Fri Oct 26 05:16:48 2001
294 +++ cups-1.1.12-new/man/Makefile Sat Nov 24 20:48:12 2001
299 - $(INSTALL_DIR) $(MANDIR)/man1
300 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1
301 for file in $(MAN1); do \
302 - $(INSTALL_MAN) $$file $(MANDIR)/man1/`basename $$file man`1; \
303 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/man1/`basename $$file man`1; \
305 - $(RM) $(MANDIR)/man1/cancel.1
306 - $(LN) lp.1 $(MANDIR)/man1/cancel.1
307 - $(INSTALL_DIR) $(PMANDIR)/man3
308 + $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/man3
309 for file in $(MAN3); do \
310 - $(INSTALL_MAN) $$file $(PMANDIR)/man3/`basename $$file man`3; \
311 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/man3/`basename $$file man`3; \
313 - $(INSTALL_DIR) $(MANDIR)/man5
314 + $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/man5
315 for file in $(MAN5); do \
316 - $(INSTALL_MAN) $$file $(MANDIR)/man5/`basename $$file man`5; \
317 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/man5/`basename $$file man`5; \
319 - $(INSTALL_DIR) $(AMANDIR)/man$(MAN8EXT)
320 + $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/man8
321 for file in $(MAN8); do \
322 - $(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
323 + $(INSTALL_MAN) $$file $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
325 - $(RM) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
326 - $(LN) accept.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
327 - $(RM) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
328 - $(LN) enable.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
329 - $(INSTALL_DIR) $(MANDIR)/cat1
330 - for file in $(CAT1); do \
331 - $(INSTALL_MAN) $$file $(MANDIR)/cat1; \
333 - $(RM) $(MANDIR)/cat1/cancel.$(CAT1EXT)
334 - $(LN) lp.$(CAT1EXT) $(MANDIR)/cat1/cancel.$(CAT1EXT)
335 - $(INSTALL_DIR) $(PMANDIR)/cat3
336 - for file in $(CAT3); do \
337 - $(INSTALL_MAN) $$file $(PMANDIR)/cat3; \
339 - $(INSTALL_DIR) $(MANDIR)/cat5
340 - for file in $(CAT5); do \
341 - $(INSTALL_MAN) $$file $(MANDIR)/cat5; \
343 - $(INSTALL_DIR) $(AMANDIR)/cat$(MAN8EXT)
344 - for file in $(CAT8); do \
345 - $(INSTALL_MAN) $$file $(AMANDIR)/cat$(MAN8EXT); \
347 - $(RM) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
348 - $(LN) accept.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
349 - $(RM) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
350 - $(LN) enable.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
351 + echo ".so accept.$(MAN8EXT)" > $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
352 + echo ".so enable.$(MAN8EXT)" > $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
357 diff -Nur cups-1.1.12/pdftops/Makefile cups-1.1.12-new/pdftops/Makefile
358 --- cups-1.1.12/pdftops/Makefile Wed Jun 27 23:53:16 2001
359 +++ cups-1.1.12-new/pdftops/Makefile Sat Nov 24 20:27:51 2001
364 - $(INSTALL_DIR) $(SERVERBIN)/filter
365 - $(INSTALL_BIN) pdftops $(SERVERBIN)/filter
366 + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/filter
367 + $(INSTALL_BIN) pdftops $(DESTDIR)$(SERVERBIN)/filter
371 diff -Nur cups-1.1.12/ppd/Makefile cups-1.1.12-new/ppd/Makefile
372 --- cups-1.1.12/ppd/Makefile Thu Jul 19 22:17:56 2001
373 +++ cups-1.1.12-new/ppd/Makefile Sat Nov 24 20:27:51 2001
378 - $(INSTALL_DIR) $(DATADIR)/model
379 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/model
380 for file in $(FILES); do \
381 - $(INSTALL_DATA) $$file $(DATADIR)/model; \
382 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/model; \
386 diff -Nur cups-1.1.12/pstoraster/Makefile cups-1.1.12-new/pstoraster/Makefile
387 --- cups-1.1.12/pstoraster/Makefile Wed Oct 31 17:18:33 2001
388 +++ cups-1.1.12-new/pstoraster/Makefile Sat Nov 24 20:27:51 2001
389 @@ -376,11 +376,11 @@
393 - $(INSTALL_DIR) $(SERVERBIN)/filter
394 - $(INSTALL_BIN) pstoraster $(SERVERBIN)/filter
395 - $(INSTALL_DIR) $(DATADIR)/pstoraster
396 + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/filter
397 + $(INSTALL_BIN) pstoraster $(DESTDIR)$(SERVERBIN)/filter
398 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/pstoraster
399 for file in $(DFILES); do \
400 - $(INSTALL_DATA) $$file $(DATADIR)/pstoraster; \
401 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/pstoraster; \
405 diff -Nur cups-1.1.12/scheduler/Makefile cups-1.1.12-new/scheduler/Makefile
406 --- cups-1.1.12/scheduler/Makefile Mon Jul 23 20:48:52 2001
407 +++ cups-1.1.12-new/scheduler/Makefile Sat Nov 24 20:27:51 2001
412 - $(INSTALL_DIR) $(SBINDIR)
413 - $(INSTALL_BIN) cupsd $(SBINDIR)
414 - $(INSTALL_DIR) $(SERVERBIN)/daemon
415 - $(INSTALL_BIN) cups-lpd $(SERVERBIN)/daemon
416 - $(INSTALL_BIN) cups-polld $(SERVERBIN)/daemon
417 - $(INSTALL_DIR) -m 711 -o $(CUPS_USER) -g $(CUPS_GROUP) $(SERVERROOT)/certs
418 - $(INSTALL_DIR) $(SERVERROOT)/interfaces
419 - $(INSTALL_DIR) $(SERVERROOT)/ppd
420 - $(INSTALL_DIR) $(LOGDIR)
421 - $(INSTALL_DIR) -m 700 -o $(CUPS_USER) -g $(CUPS_GROUP) $(REQUESTS)
422 - $(INSTALL_DIR) -m 1700 -o $(CUPS_USER) -g $(CUPS_GROUP) $(REQUESTS)/tmp
423 + $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
424 + $(INSTALL_BIN) cupsd $(DESTDIR)$(SBINDIR)
425 + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/daemon
426 + $(INSTALL_BIN) cups-lpd $(DESTDIR)$(SERVERBIN)/daemon
427 + $(INSTALL_BIN) cups-polld $(DESTDIR)$(SERVERBIN)/daemon
428 + $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/certs
429 + $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/interfaces
430 + $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/ppd
431 + $(INSTALL_DIR) $(DESTDIR)$(LOGDIR)
432 + $(INSTALL_DIR) $(DESTDIR)$(REQUESTS)
433 + $(INSTALL_DIR) $(DESTDIR)$(REQUESTS)/tmp
437 diff -Nur cups-1.1.12/systemv/Makefile cups-1.1.12-new/systemv/Makefile
438 --- cups-1.1.12/systemv/Makefile Tue Sep 18 21:14:47 2001
439 +++ cups-1.1.12-new/systemv/Makefile Sat Nov 24 20:39:57 2001
444 - $(INSTALL_DIR) $(BINDIR)
445 - $(INSTALL_BIN) accept $(SBINDIR)
446 - $(RM) $(SBINDIR)/reject
447 - $(LN) accept $(SBINDIR)/reject
448 - $(INSTALL_BIN) cupsaddsmb $(SBINDIR)
449 - $(INSTALL_BIN) lpadmin $(SBINDIR)
450 - $(INSTALL_BIN) lpinfo $(SBINDIR)
451 - $(INSTALL_BIN) lpmove $(SBINDIR)
452 - $(INSTALL_BIN) cancel $(BINDIR)
453 - $(RM) $(BINDIR)/disable
454 - $(LN) ../sbin/accept $(BINDIR)/disable
455 - $(RM) $(BINDIR)/enable
456 - $(LN) ../sbin/accept $(BINDIR)/enable
457 - $(INSTALL_BIN) lp $(BINDIR)
458 - $(INSTALL_BIN) lpoptions $(BINDIR)
459 - $(INSTALL_BIN) lpstat $(BINDIR)
460 - $(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR)
461 + $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
462 + $(INSTALL_BIN) accept $(DESTDIR)$(SBINDIR)
463 + $(LN) -sf accept $(DESTDIR)$(SBINDIR)/reject
464 + $(INSTALL_BIN) cupsaddsmb $(DESTDIR)$(SBINDIR)
465 + $(INSTALL_BIN) lpadmin $(DESTDIR)$(SBINDIR)
466 + $(INSTALL_BIN) lpinfo $(DESTDIR)$(SBINDIR)
467 + $(INSTALL_BIN) lpmove $(DESTDIR)$(SBINDIR)
468 + $(INSTALL_BIN) cancel $(DESTDIR)$(BINDIR)
469 + $(LN) -sf ../sbin/accept $(DESTDIR)$(BINDIR)/disable
470 + $(LN) -sf ../sbin/accept $(DESTDIR)$(BINDIR)/enable
471 + $(INSTALL_BIN) lp $(DESTDIR)$(BINDIR)
472 + $(INSTALL_BIN) lpoptions $(DESTDIR)$(BINDIR)
473 + $(INSTALL_BIN) lpstat $(DESTDIR)$(BINDIR)
474 + $(INSTALL_BIN) lppasswd $(DESTDIR)$(BINDIR)
478 diff -Nur cups-1.1.12/templates/Makefile cups-1.1.12-new/templates/Makefile
479 --- cups-1.1.12/templates/Makefile Mon Sep 24 19:51:16 2001
480 +++ cups-1.1.12-new/templates/Makefile Sat Nov 24 20:27:51 2001
485 - $(INSTALL_DIR) $(DATADIR)/templates
486 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/templates
487 for file in $(FILES); do \
488 - $(INSTALL_DATA) $$file $(DATADIR)/templates; \
489 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/templates; \