1 diff -urN cups-1.1.19.orig/Makefile cups-1.1.19/Makefile
2 --- cups-1.1.19.orig/Makefile Tue May 27 23:14:31 2003
3 +++ cups-1.1.19/Makefile Tue May 27 23:29:58 2003
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/PrintingServices"; then \
26 - $(INSTALL_SCRIPT) cups.osx $(BUILDROOT)$(INITDDIR)/PrintingServices; \
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
38 # Install source and header files...
39 diff -urN cups-1.1.19.orig/backend/Makefile cups-1.1.19/backend/Makefile
40 --- cups-1.1.19.orig/backend/Makefile Tue May 27 23:14:31 2003
41 +++ cups-1.1.19/backend/Makefile Tue May 27 23:15:51 2003
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 + $(RM) $(DESTDIR)$(SERVERBIN)/backend/http
55 + $(LN) ipp $(DESTDIR)$(SERVERBIN)/backend/http
59 diff -urN cups-1.1.19.orig/berkeley/Makefile cups-1.1.19/berkeley/Makefile
60 --- cups-1.1.19.orig/berkeley/Makefile Tue May 27 23:14:31 2003
61 +++ cups-1.1.19/berkeley/Makefile Tue May 27 23:15:51 2003
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)
81 diff -urN cups-1.1.19.orig/cgi-bin/Makefile cups-1.1.19/cgi-bin/Makefile
82 --- cups-1.1.19.orig/cgi-bin/Makefile Tue May 27 23:14:31 2003
83 +++ cups-1.1.19/cgi-bin/Makefile Tue May 27 23:15:51 2003
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; \
96 diff -urN cups-1.1.19.orig/conf/Makefile cups-1.1.19/conf/Makefile
97 --- cups-1.1.19.orig/conf/Makefile Tue May 27 23:14:31 2003
98 +++ cups-1.1.19/conf/Makefile Tue May 27 23:15:51 2003
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 ; \
108 + if test -r $(DESTDIR)$(SERVERROOT)/$$file ; then \
109 + $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT)/$$file.N ; \
111 - $(INSTALL_DATA) $$file $(SERVERROOT) ; \
112 + $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT) ; \
115 for file in $(REPLACE); do \
116 - if test -r $(SERVERROOT)/$$file ; then \
117 - $(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
118 + if test -r $(DESTDIR)$(SERVERROOT)/$$file ; then \
119 + $(MV) $(DESTDIR)$(SERVERROOT)/$$file $(DESTDIR)$(SERVERROOT)/$$file.O ; \
121 - $(INSTALL_DATA) $$file $(SERVERROOT) ; \
122 + $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT) ; \
124 -if test x$(PAMDIR) != x$(BUILDROOT); then \
125 - $(INSTALL_DIR) $(PAMDIR); \
126 - $(INSTALL_DATA) pam.conf $(PAMDIR)/cups; \
127 + $(INSTALL_DIR) $(DESTDIR)$(PAMDIR); \
128 + $(INSTALL_DATA) pam.conf $(DESTDIR)$(PAMDIR)/cups; \
132 diff -urN cups-1.1.19.orig/cups/Makefile cups-1.1.19/cups/Makefile
133 --- cups-1.1.19.orig/cups/Makefile Tue May 27 23:14:31 2003
134 +++ cups-1.1.19/cups/Makefile Tue May 27 23:15:51 2003
138 install: all installhdrs
139 - $(INSTALL_DIR) $(LIBDIR)
140 - $(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
141 + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
142 + $(INSTALL_LIB) $(LIBCUPS) $(DESTDIR)$(LIBDIR)
143 if test $(LIBCUPS) = "libcups.so.2" -o $(LIBCUPS) = "libcups.sl.2"; then \
144 - $(RM) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
145 - $(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
146 + $(RM) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPS) .2`; \
147 + $(LN) $(LIBCUPS) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPS) .2`; \
149 if test $(LIBCUPS) = "libcups.2.dylib"; then \
150 - $(STRIP) -x $(LIBDIR)/$(LIBCUPS); \
151 - $(RM) $(LIBDIR)/libcups.dylib; \
152 - $(LN) $(LIBCUPS) $(LIBDIR)/libcups.dylib; \
153 + $(STRIP) -x $(DESTDIR)$(LIBDIR)/$(LIBCUPS); \
154 + $(RM) $(DESTDIR)$(LIBDIR)/libcups.dylib; \
155 + $(LN) $(LIBCUPS) $(DESTDIR)$(LIBDIR)/libcups.dylib; \
157 if test $(LIBCUPS) != "libcups.a"; then \
158 - $(INSTALL_LIB) libcups.a $(LIBDIR); \
159 + $(INSTALL_LIB) libcups.a $(DESTDIR)$(LIBDIR); \
161 - $(RANLIB) $(LIBDIR)/libcups.a
162 + $(RANLIB) $(DESTDIR)$(LIBDIR)/libcups.a
165 - $(INSTALL_DIR) $(INCLUDEDIR)/cups
166 + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/cups
167 for file in $(HEADERS); do \
168 - $(INSTALL_DATA) $$file $(INCLUDEDIR)/cups; \
169 + $(INSTALL_DATA) $$file $(DESTDIR)$(INCLUDEDIR)/cups; \
173 diff -urN cups-1.1.19.orig/data/Makefile cups-1.1.19/data/Makefile
174 --- cups-1.1.19.orig/data/Makefile Tue May 27 23:14:31 2003
175 +++ cups-1.1.19/data/Makefile Tue May 27 23:15:51 2003
180 - $(INSTALL_DIR) $(DATADIR)/banners
181 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/banners
182 for file in $(BANNERS); do \
183 - $(INSTALL_DATA) $$file $(DATADIR)/banners; \
184 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/banners; \
186 - $(INSTALL_DIR) $(DATADIR)/charsets
187 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/charsets
188 for file in $(CHARSETS); do \
189 - $(INSTALL_DATA) $$file $(DATADIR)/charsets; \
190 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/charsets; \
192 - $(INSTALL_DIR) $(DATADIR)/data
193 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/data
194 for file in $(DATAFILES); do \
195 - $(INSTALL_DATA) $$file $(DATADIR)/data; \
196 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/data; \
200 diff -urN cups-1.1.19.orig/doc/Makefile cups-1.1.19/doc/Makefile
201 --- cups-1.1.19.orig/doc/Makefile Tue May 27 23:14:31 2003
202 +++ cups-1.1.19/doc/Makefile Tue May 27 23:15:51 2003
203 @@ -123,21 +123,21 @@
207 - $(INSTALL_DIR) $(DOCDIR)
208 + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
209 for file in $(WEBPAGES); do \
210 - $(INSTALL_MAN) $$file $(DOCDIR); \
211 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \
213 - $(INSTALL_MAN) overview.html $(DOCDIR)
214 - $(INSTALL_MAN) overview.pdf $(DOCDIR)
215 + $(INSTALL_MAN) overview.html $(DESTDIR)$(DOCDIR)
216 + $(INSTALL_MAN) overview.pdf $(DESTDIR)$(DOCDIR)
217 for file in $(DOCUMENTS:.shtml=.html); do \
218 - $(INSTALL_MAN) $$file $(DOCDIR); \
219 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \
221 for file in $(DOCUMENTS:.shtml=.pdf); do \
222 - $(INSTALL_MAN) $$file $(DOCDIR); \
223 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \
225 - $(INSTALL_DIR) $(DOCDIR)/images
226 + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/images
227 for file in $(WEBIMAGES) $(DOCIMAGES); do \
228 - $(INSTALL_MAN) $$file $(DOCDIR)/images; \
229 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/images; \
231 cd de; $(MAKE) $(MFLAGS) install
232 cd fr; $(MAKE) $(MFLAGS) install
233 diff -urN cups-1.1.19.orig/doc/de/Makefile cups-1.1.19/doc/de/Makefile
234 --- cups-1.1.19.orig/doc/de/Makefile Tue May 27 23:14:31 2003
235 +++ cups-1.1.19/doc/de/Makefile Tue May 27 23:48:58 2003
240 - $(INSTALL_DIR) $(DOCDIR)/de
241 + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/de
242 for file in $(WEBPAGES); do \
243 - $(INSTALL_MAN) $$file $(DOCDIR)/de; \
244 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/de; \
246 - $(INSTALL_DIR) $(DOCDIR)/de/images
247 + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/de/images
248 for file in $(WEBIMAGES); do \
249 - $(INSTALL_MAN) $$file $(DOCDIR)/de/images; \
250 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/de/images; \
254 diff -urN cups-1.1.19.orig/doc/fr/Makefile cups-1.1.19/doc/fr/Makefile
255 --- cups-1.1.19.orig/doc/fr/Makefile Tue May 27 23:14:31 2003
256 +++ cups-1.1.19/doc/fr/Makefile Tue May 27 23:15:51 2003
257 @@ -105,21 +105,21 @@
261 - $(INSTALL_DIR) $(DOCDIR)/fr
262 + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/fr
263 for file in $(WEBPAGES); do \
264 - $(INSTALL_MAN) $$file $(DOCDIR)/fr; \
265 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/fr; \
267 - $(INSTALL_MAN) overview.html $(DOCDIR)/fr
268 - $(INSTALL_MAN) overview.pdf $(DOCDIR)/fr
269 + $(INSTALL_MAN) overview.html $(DESTDIR)$(DOCDIR)/fr
270 + $(INSTALL_MAN) overview.pdf $(DESTDIR)$(DOCDIR)/fr
271 for file in $(DOCUMENTS:.shtml=.html); do \
272 - $(INSTALL_MAN) $$file $(DOCDIR)/fr; \
273 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/fr; \
275 for file in $(DOCUMENTS:.shtml=.pdf); do \
276 - $(INSTALL_MAN) $$file $(DOCDIR)/fr; \
277 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/fr; \
279 - $(INSTALL_DIR) $(DOCDIR)/fr/images
280 + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/fr/images
281 for file in $(WEBIMAGES); do \
282 - $(INSTALL_MAN) $$file $(DOCDIR)/fr/images; \
283 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/fr/images; \
287 diff -urN cups-1.1.19.orig/filter/Makefile cups-1.1.19/filter/Makefile
288 --- cups-1.1.19.orig/filter/Makefile Tue May 27 23:14:31 2003
289 +++ cups-1.1.19/filter/Makefile Tue May 27 23:15:51 2003
293 install: all installhdrs
294 - $(INSTALL_DIR) $(SERVERBIN)/filter
295 + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/filter
296 for file in $(TARGETS); do \
297 - $(INSTALL_BIN) $$file $(SERVERBIN)/filter; \
298 + $(INSTALL_BIN) $$file $(DESTDIR)$(SERVERBIN)/filter; \
300 - $(INSTALL_DIR) $(LIBDIR)
301 - $(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR)
302 + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
303 + $(INSTALL_LIB) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)
304 -if test $(LIBCUPSIMAGE) = "libcupsimage.so.2" -o $(LIBCUPSIMAGE) = "libcupsimage.sl.2"; then \
305 - $(RM) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
306 - $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
307 + $(RM) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
308 + $(LN) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
310 -if test $(LIBCUPSIMAGE) = "libcupsimage.2.dylib"; then \
311 - $(STRIP) -x $(LIBDIR)/$(LIBCUPSIMAGE); \
312 - $(RM) $(LIBDIR)/libcupsimage.dylib; \
313 - $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/libcupsimage.dylib; \
314 + $(STRIP) -x $(DESTDIR)$(LIBDIR)/$(LIBCUPSIMAGE); \
315 + $(RM) $(DESTDIR)$(LIBDIR)/libcupsimage.dylib; \
316 + $(LN) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)/libcupsimage.dylib; \
318 -if test $(LIBCUPSIMAGE) != "libcupsimage.a"; then \
319 - $(INSTALL_LIB) libcupsimage.a $(LIBDIR); \
320 + $(INSTALL_LIB) libcupsimage.a $(DESTDIR)$(LIBDIR); \
322 - $(RANLIB) $(LIBDIR)/libcupsimage.a
323 + $(RANLIB) $(DESTDIR)$(LIBDIR)/libcupsimage.a
326 - $(INSTALL_DIR) $(INCLUDEDIR)/cups
327 - $(INSTALL_DATA) image.h $(INCLUDEDIR)/cups
328 - $(INSTALL_DATA) raster.h $(INCLUDEDIR)/cups
329 + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/cups
330 + $(INSTALL_DATA) image.h $(DESTDIR)$(INCLUDEDIR)/cups
331 + $(INSTALL_DATA) raster.h $(DESTDIR)$(INCLUDEDIR)/cups
335 diff -urN cups-1.1.19.orig/fonts/Makefile cups-1.1.19/fonts/Makefile
336 --- cups-1.1.19.orig/fonts/Makefile Tue May 27 23:14:31 2003
337 +++ cups-1.1.19/fonts/Makefile Tue May 27 23:15:51 2003
342 - $(INSTALL_DIR) $(DATADIR)/fonts
343 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/fonts
344 for file in $(FONTS); do \
345 - $(INSTALL_DATA) $$file $(DATADIR)/fonts; \
346 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/fonts; \
350 diff -urN cups-1.1.19.orig/locale/Makefile cups-1.1.19/locale/Makefile
351 --- cups-1.1.19.orig/locale/Makefile Tue May 27 23:14:31 2003
352 +++ cups-1.1.19/locale/Makefile Tue May 27 23:15:51 2003
357 - $(INSTALL_DIR) $(LOCALEDIR)
358 + $(INSTALL_DIR) $(DESTDIR)$(LOCALEDIR)
359 for dir in $(LOCALES) ; do \
360 - $(INSTALL_DIR) $(LOCALEDIR)/$$dir ; \
361 - $(INSTALL_DATA) $$dir/cups_$$dir $(LOCALEDIR)/$$dir ; \
362 + $(INSTALL_DIR) $(DESTDIR)$(LOCALEDIR)/$$dir ; \
363 + $(INSTALL_DATA) $$dir/cups_$$dir $(DESTDIR)$(LOCALEDIR)/$$dir ; \
367 diff -urN cups-1.1.19.orig/man/Makefile cups-1.1.19/man/Makefile
368 --- cups-1.1.19.orig/man/Makefile Tue May 27 23:14:31 2003
369 +++ cups-1.1.19/man/Makefile Tue May 27 23:15:51 2003
374 - $(INSTALL_DIR) $(MANDIR)/man1
375 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1
376 for file in $(MAN1); do \
377 - $(INSTALL_MAN) $$file $(MANDIR)/man1/`basename $$file man`1; \
378 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/man1/`basename $$file man`1; \
380 - $(RM) $(MANDIR)/man1/cancel.1
381 - $(LN) lp.1 $(MANDIR)/man1/cancel.1
382 - $(INSTALL_DIR) $(PMANDIR)/man3
383 + $(RM) $(DESTDIR)$(MANDIR)/man1/cancel.1
384 + $(LN) lp.1 $(DESTDIR)$(MANDIR)/man1/cancel.1
385 + $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/man3
386 for file in $(MAN3); do \
387 - $(INSTALL_MAN) $$file $(PMANDIR)/man3/`basename $$file man`3; \
388 + $(INSTALL_MAN) $$file $(DESTDIR)$(PMANDIR)/man3/`basename $$file man`3; \
390 - $(INSTALL_DIR) $(MANDIR)/man5
391 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man5
392 for file in $(MAN5); do \
393 - $(INSTALL_MAN) $$file $(MANDIR)/man5/`basename $$file man`5; \
394 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/man5/`basename $$file man`5; \
396 - $(INSTALL_DIR) $(AMANDIR)/man$(MAN8EXT)
397 + $(INSTALL_DIR) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)
398 for file in $(MAN8); do \
399 - $(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
400 + $(INSTALL_MAN) $$file $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
402 - $(RM) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
403 - $(LN) accept.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
404 - $(RM) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
405 - $(LN) enable.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
406 - $(INSTALL_DIR) $(MANDIR)/cat1
407 + $(RM) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
408 + $(LN) accept.$(MAN8EXT) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
409 + $(RM) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
410 + $(LN) enable.$(MAN8EXT) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
411 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/cat1
412 for file in $(CAT1); do \
413 - $(INSTALL_MAN) $$file $(MANDIR)/cat1; \
414 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/cat1; \
416 - $(RM) $(MANDIR)/cat1/cancel.$(CAT1EXT)
417 - $(LN) lp.$(CAT1EXT) $(MANDIR)/cat1/cancel.$(CAT1EXT)
418 - $(INSTALL_DIR) $(PMANDIR)/cat3
419 + $(RM) $(DESTDIR)$(MANDIR)/cat1/cancel.$(CAT1EXT)
420 + $(LN) lp.$(CAT1EXT) $(DESTDIR)$(MANDIR)/cat1/cancel.$(CAT1EXT)
421 + $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/cat3
422 for file in $(CAT3); do \
423 - $(INSTALL_MAN) $$file $(PMANDIR)/cat3; \
424 + $(INSTALL_MAN) $$file $(DESTDIR)$(PMANDIR)/cat3; \
426 - $(INSTALL_DIR) $(MANDIR)/cat5
427 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/cat5
428 for file in $(CAT5); do \
429 - $(INSTALL_MAN) $$file $(MANDIR)/cat5; \
430 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/cat5; \
432 - $(INSTALL_DIR) $(AMANDIR)/cat$(MAN8EXT)
433 + $(INSTALL_DIR) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)
434 for file in $(CAT8); do \
435 - $(INSTALL_MAN) $$file $(AMANDIR)/cat$(MAN8EXT); \
436 + $(INSTALL_MAN) $$file $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT); \
438 - $(RM) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
439 - $(LN) accept.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
440 - $(RM) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
441 - $(LN) enable.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
442 + $(RM) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
443 + $(LN) accept.$(CAT8EXT) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
444 + $(RM) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
445 + $(LN) enable.$(CAT8EXT) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
446 for dir in $(LANGDIRS); do \
447 echo "Installing all in man/$$dir..."; \
448 (cd $$dir; $(MAKE) $(MFLAGS) install); \
449 diff -urN cups-1.1.19.orig/man/fr/Makefile cups-1.1.19/man/fr/Makefile
450 --- cups-1.1.19.orig/man/fr/Makefile Tue May 27 23:14:31 2003
451 +++ cups-1.1.19/man/fr/Makefile Tue May 27 23:15:51 2003
456 - $(INSTALL_DIR) $(MANDIR)/$(LANGUAGE)/man1
457 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man1
458 for file in $(MAN1); do \
459 - $(INSTALL_MAN) $$file $(MANDIR)/$(LANGUAGE)/man1/`basename $$file man`1; \
460 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man1/`basename $$file man`1; \
462 - $(RM) $(MANDIR)/$(LANGUAGE)/man1/cancel.1
463 - $(LN) lp.1 $(MANDIR)/$(LANGUAGE)/man1/cancel.1
464 - $(INSTALL_DIR) $(PMANDIR)/fr/man3
465 + $(RM) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man1/cancel.1
466 + $(LN) lp.1 $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man1/cancel.1
467 + $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/fr/man3
468 for file in $(MAN3); do \
469 - $(INSTALL_MAN) $$file $(PMANDIR)/fr/man3/`basename $$file man`3; \
470 + $(INSTALL_MAN) $$file $(DESTDIR)$(PMANDIR)/fr/man3/`basename $$file man`3; \
472 - $(INSTALL_DIR) $(MANDIR)/$(LANGUAGE)/man5
473 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man5
474 for file in $(MAN5); do \
475 - $(INSTALL_MAN) $$file $(MANDIR)/$(LANGUAGE)/man5/`basename $$file man`5; \
476 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man5/`basename $$file man`5; \
478 - $(INSTALL_DIR) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)
479 + $(INSTALL_DIR) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)
480 for file in $(MAN8); do \
481 - $(INSTALL_MAN) $$file $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
482 + $(INSTALL_MAN) $$file $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
484 - $(RM) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/reject.$(MAN8EXT)
485 - $(LN) accept.$(MAN8EXT) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/reject.$(MAN8EXT)
486 - $(RM) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/disable.$(MAN8EXT)
487 - $(LN) enable.$(MAN8EXT) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/disable.$(MAN8EXT)
488 - $(INSTALL_DIR) $(MANDIR)/$(LANGUAGE)/cat1
489 + $(RM) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/reject.$(MAN8EXT)
490 + $(LN) accept.$(MAN8EXT) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/reject.$(MAN8EXT)
491 + $(RM) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/disable.$(MAN8EXT)
492 + $(LN) enable.$(MAN8EXT) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/disable.$(MAN8EXT)
493 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat1
494 for file in $(CAT1); do \
495 - $(INSTALL_MAN) $$file $(MANDIR)/$(LANGUAGE)/cat1; \
496 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat1; \
498 - $(RM) $(MANDIR)/$(LANGUAGE)/cat1/cancel.$(CAT1EXT)
499 - $(LN) lp.$(CAT1EXT) $(MANDIR)/$(LANGUAGE)/cat1/cancel.$(CAT1EXT)
500 - $(INSTALL_DIR) $(PMANDIR)/fr/cat3
501 + $(RM) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat1/cancel.$(CAT1EXT)
502 + $(LN) lp.$(CAT1EXT) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat1/cancel.$(CAT1EXT)
503 + $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/fr/cat3
504 for file in $(CAT3); do \
505 - $(INSTALL_MAN) $$file $(PMANDIR)/fr/cat3; \
506 + $(INSTALL_MAN) $$file $(DESTDIR)$(PMANDIR)/fr/cat3; \
508 - $(INSTALL_DIR) $(MANDIR)/$(LANGUAGE)/cat5
509 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat5
510 for file in $(CAT5); do \
511 - $(INSTALL_MAN) $$file $(MANDIR)/$(LANGUAGE)/cat5; \
512 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat5; \
514 - $(INSTALL_DIR) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)
515 + $(INSTALL_DIR) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)
516 for file in $(CAT8); do \
517 - $(INSTALL_MAN) $$file $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT); \
518 + $(INSTALL_MAN) $$file $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT); \
520 - $(RM) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/reject.$(CAT8EXT)
521 - $(LN) accept.$(CAT8EXT) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/reject.$(CAT8EXT)
522 - $(RM) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/disable.$(CAT8EXT)
523 - $(LN) enable.$(CAT8EXT) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/disable.$(CAT8EXT)
524 + $(RM) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/reject.$(CAT8EXT)
525 + $(LN) accept.$(CAT8EXT) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/reject.$(CAT8EXT)
526 + $(RM) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/disable.$(CAT8EXT)
527 + $(LN) enable.$(CAT8EXT) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/disable.$(CAT8EXT)
531 diff -urN cups-1.1.19.orig/pdftops/Makefile cups-1.1.19/pdftops/Makefile
532 --- cups-1.1.19.orig/pdftops/Makefile Tue May 27 23:14:31 2003
533 +++ cups-1.1.19/pdftops/Makefile Tue May 27 23:15:51 2003
538 - $(INSTALL_DIR) $(SERVERBIN)/filter
539 - $(INSTALL_BIN) pdftops $(SERVERBIN)/filter
540 + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/filter
541 + $(INSTALL_BIN) pdftops $(DESTDIR)$(SERVERBIN)/filter
545 diff -urN cups-1.1.19.orig/ppd/Makefile cups-1.1.19/ppd/Makefile
546 --- cups-1.1.19.orig/ppd/Makefile Tue May 27 23:14:31 2003
547 +++ cups-1.1.19/ppd/Makefile Tue May 27 23:15:51 2003
552 - $(INSTALL_DIR) $(DATADIR)/model
553 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/model
554 for file in $(FILES); do \
555 - $(INSTALL_DATA) $$file $(DATADIR)/model; \
556 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/model; \
560 diff -urN cups-1.1.19.orig/scheduler/Makefile cups-1.1.19/scheduler/Makefile
561 --- cups-1.1.19.orig/scheduler/Makefile Tue May 27 23:14:31 2003
562 +++ cups-1.1.19/scheduler/Makefile Tue May 27 23:21:03 2003
567 - $(INSTALL_DIR) $(SBINDIR)
568 - $(INSTALL_BIN) cupsd $(SBINDIR)
569 - $(INSTALL_DIR) $(SERVERBIN)/daemon
570 - $(INSTALL_BIN) cups-lpd $(SERVERBIN)/daemon
571 - $(INSTALL_BIN) cups-polld $(SERVERBIN)/daemon
572 - $(INSTALL_DIR) -m 711 $(SERVERROOT)/certs
573 - $(INSTALL_DIR) $(SERVERROOT)/interfaces
574 - $(INSTALL_DIR) $(SERVERROOT)/ppd
575 - $(INSTALL_DIR) $(LOGDIR)
576 - $(INSTALL_DIR) -m 710 $(REQUESTS)
577 - $(INSTALL_DIR) -m 1770 $(REQUESTS)/tmp
578 + $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
579 + $(INSTALL_BIN) cupsd $(DESTDIR)$(SBINDIR)
580 + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/daemon
581 + $(INSTALL_BIN) cups-lpd $(DESTDIR)$(SERVERBIN)/daemon
582 + $(INSTALL_BIN) cups-polld $(DESTDIR)$(SERVERBIN)/daemon
583 + $(INSTALL_DIR) -m 711 $(DESTDIR)$(SERVERROOT)/certs
584 + $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/interfaces
585 + $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/ppd
586 + $(INSTALL_DIR) $(DESTDIR)$(LOGDIR)
587 + $(INSTALL_DIR) -m 710 $(DESTDIR)$(REQUESTS)
588 + $(INSTALL_DIR) -m 1770 $(DESTDIR)$(REQUESTS)/tmp
592 diff -urN cups-1.1.19.orig/systemv/Makefile cups-1.1.19/systemv/Makefile
593 --- cups-1.1.19.orig/systemv/Makefile Tue May 27 23:14:31 2003
594 +++ cups-1.1.19/systemv/Makefile Tue May 27 23:25:14 2003
599 - $(INSTALL_DIR) $(SBINDIR)
600 - $(INSTALL_BIN) accept $(SBINDIR)
601 - $(RM) $(SBINDIR)/reject
602 - $(LN) accept $(SBINDIR)/reject
603 - $(INSTALL_BIN) cupsaddsmb $(SBINDIR)
604 - $(INSTALL_BIN) lpadmin $(SBINDIR)
605 - $(INSTALL_BIN) lpinfo $(SBINDIR)
606 - $(INSTALL_BIN) lpmove $(SBINDIR)
607 - $(INSTALL_DIR) $(BINDIR)
608 - $(INSTALL_BIN) cancel $(BINDIR)
609 - $(INSTALL_BIN) cupstestppd $(BINDIR)
610 - $(RM) $(BINDIR)/disable
611 - $(LN) ../sbin/accept $(BINDIR)/disable
612 - $(RM) $(BINDIR)/enable
613 - $(LN) ../sbin/accept $(BINDIR)/enable
614 - $(INSTALL_BIN) lp $(BINDIR)
615 - $(INSTALL_BIN) lpoptions $(BINDIR)
616 - $(INSTALL_BIN) lpstat $(BINDIR)
617 - $(INSTALL_BIN) lppasswd $(BINDIR)
618 - -$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR)
619 + $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
620 + $(INSTALL_BIN) accept $(DESTDIR)$(SBINDIR)
621 + $(RM) $(DESTDIR)$(SBINDIR)/reject
622 + $(LN) accept $(DESTDIR)$(SBINDIR)/reject
623 + $(INSTALL_BIN) cupsaddsmb $(DESTDIR)$(SBINDIR)
624 + $(INSTALL_BIN) lpadmin $(DESTDIR)$(SBINDIR)
625 + $(INSTALL_BIN) lpinfo $(DESTDIR)$(SBINDIR)
626 + $(INSTALL_BIN) lpmove $(DESTDIR)$(SBINDIR)
627 + $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
628 + $(INSTALL_BIN) cancel $(DESTDIR)$(BINDIR)
629 + $(INSTALL_BIN) cupstestppd $(DESTDIR)$(BINDIR)
630 + $(RM) $(DESTDIR)$(BINDIR)/disable
631 + $(LN) ../sbin/accept $(DESTDIR)$(BINDIR)/disable
632 + $(RM) $(DESTDIR)$(BINDIR)/enable
633 + $(LN) ../sbin/accept $(DESTDIR)$(BINDIR)/enable
634 + $(INSTALL_BIN) lp $(DESTDIR)$(BINDIR)
635 + $(INSTALL_BIN) lpoptions $(DESTDIR)$(BINDIR)
636 + $(INSTALL_BIN) lpstat $(DESTDIR)$(BINDIR)
637 + $(INSTALL_BIN) lppasswd $(DESTDIR)$(BINDIR)
638 + -$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(DESTDIR)$(BINDIR)
642 diff -urN cups-1.1.19.orig/templates/Makefile cups-1.1.19/templates/Makefile
643 --- cups-1.1.19.orig/templates/Makefile Tue May 27 23:14:31 2003
644 +++ cups-1.1.19/templates/Makefile Tue May 27 23:15:51 2003
649 - $(INSTALL_DIR) $(DATADIR)/templates
650 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/templates
651 for file in $(FILES); do \
652 - $(INSTALL_DATA) $$file $(DATADIR)/templates; \
653 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/templates; \
655 cd de; $(MAKE) $(MFLAGS) install
656 cd fr; $(MAKE) $(MFLAGS) install
657 diff -urN cups-1.1.19.orig/templates/de/Makefile cups-1.1.19/templates/de/Makefile
658 --- cups-1.1.19.orig/templates/de/Makefile Tue May 27 23:14:31 2003
659 +++ cups-1.1.19/templates/de/Makefile Tue May 27 23:52:26 2003
664 - $(INSTALL_DIR) $(DATADIR)/templates/de
665 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/templates/de
666 for file in $(FILES); do \
667 - $(INSTALL_DATA) $$file $(DATADIR)/templates/de; \
668 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/templates/de; \
672 diff -urN cups-1.1.19.orig/templates/fr/Makefile cups-1.1.19/templates/fr/Makefile
673 --- cups-1.1.19.orig/templates/fr/Makefile Tue May 27 23:14:31 2003
674 +++ cups-1.1.19/templates/fr/Makefile Tue May 27 23:15:51 2003
679 - $(INSTALL_DIR) $(DATADIR)/templates/fr
680 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/templates/fr
681 for file in $(FILES); do \
682 - $(INSTALL_DATA) $$file $(DATADIR)/templates/fr; \
683 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/templates/fr; \