1 diff -urN cups-1.1.21rc1.org/backend/Makefile cups-1.1.21rc1/backend/Makefile
2 --- cups-1.1.21rc1.org/backend/Makefile 2004-06-11 11:49:11.476926896 +0200
3 +++ cups-1.1.21rc1/backend/Makefile 2004-06-11 11:49:30.038105168 +0200
8 - $(INSTALL_DIR) $(SERVERBIN)/backend
9 + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/backend
10 for file in $(BACKENDS); do \
11 - $(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
12 + $(INSTALL_BIN) $$file $(DESTDIR)$(SERVERBIN)/backend; \
14 - $(RM) $(SERVERBIN)/backend/http
15 - $(LN) ipp $(SERVERBIN)/backend/http
16 + $(RM) $(DESTDIR)$(SERVERBIN)/backend/http
17 + $(LN) ipp $(DESTDIR)$(SERVERBIN)/backend/http
21 diff -urN cups-1.1.21rc1.org/berkeley/Makefile cups-1.1.21rc1/berkeley/Makefile
22 --- cups-1.1.21rc1.org/berkeley/Makefile 2004-06-11 11:49:11.500923248 +0200
23 +++ cups-1.1.21rc1/berkeley/Makefile 2004-06-11 11:49:30.039105016 +0200
28 - $(INSTALL_DIR) $(BINDIR)
29 - $(INSTALL_BIN) lpq $(BINDIR)
30 - $(INSTALL_BIN) lpr $(BINDIR)
31 - $(INSTALL_BIN) lprm $(BINDIR)
32 - $(INSTALL_DIR) $(SBINDIR)
33 - $(INSTALL_BIN) lpc $(SBINDIR)
34 + $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
35 + $(INSTALL_BIN) lpq $(DESTDIR)$(BINDIR)
36 + $(INSTALL_BIN) lpr $(DESTDIR)$(BINDIR)
37 + $(INSTALL_BIN) lprm $(DESTDIR)$(BINDIR)
38 + $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
39 + $(INSTALL_BIN) lpc $(DESTDIR)$(SBINDIR)
43 diff -urN cups-1.1.21rc1.org/cgi-bin/Makefile cups-1.1.21rc1/cgi-bin/Makefile
44 --- cups-1.1.21rc1.org/cgi-bin/Makefile 2004-06-11 11:49:11.502922944 +0200
45 +++ cups-1.1.21rc1/cgi-bin/Makefile 2004-06-11 11:49:30.041104712 +0200
50 - $(INSTALL_DIR) $(SERVERBIN)/cgi-bin
51 + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/cgi-bin
52 for file in $(CGIS); do \
53 - $(INSTALL_BIN) $$file $(SERVERBIN)/cgi-bin; \
54 + $(INSTALL_BIN) $$file $(DESTDIR)$(SERVERBIN)/cgi-bin; \
58 diff -urN cups-1.1.21rc1.org/conf/Makefile cups-1.1.21rc1/conf/Makefile
59 --- cups-1.1.21rc1.org/conf/Makefile 2004-06-11 11:49:11.507922184 +0200
60 +++ cups-1.1.21rc1/conf/Makefile 2004-06-11 11:50:42.161140800 +0200
65 - $(INSTALL_DIR) $(SERVERROOT)
66 + $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)
67 for file in $(KEEP); do \
68 - if test -r $(SERVERROOT)/$$file ; then \
69 - $(INSTALL_DATA) $$file $(SERVERROOT)/$$file.N ; \
70 + if test -r $(DESTDIR)$(SERVERROOT)/$$file ; then \
71 + $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT)/$$file.N ; \
73 - $(INSTALL_DATA) $$file $(SERVERROOT) ; \
74 + $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT) ; \
77 for file in $(REPLACE); do \
78 - if test -r $(SERVERROOT)/$$file ; then \
79 - $(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
80 + if test -r $(DESTDIR)$(SERVERROOT)/$$file ; then \
81 + $(MV) $(SERVERROOT)/$$file $(DESTDIR)$(SERVERROOT)/$$file.O ; \
83 - $(INSTALL_DATA) $$file $(SERVERROOT) ; \
84 + $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT) ; \
86 -if test x$(PAMDIR) != x$(BUILDROOT); then \
87 - $(INSTALL_DIR) $(PAMDIR); \
88 - $(INSTALL_DATA) $(PAMFILE) $(PAMDIR)/cups; \
89 + $(INSTALL_DIR) $(DESTDIR)$(PAMDIR); \
90 + $(INSTALL_DATA) $(PAMFILE) $(DESTDIR)$(PAMDIR)/cups; \
94 diff -urN cups-1.1.21rc1.org/cups/Makefile cups-1.1.21rc1/cups/Makefile
95 --- cups-1.1.21rc1.org/cups/Makefile 2004-06-11 11:49:11.529918840 +0200
96 +++ cups-1.1.21rc1/cups/Makefile 2004-06-11 11:49:30.046103952 +0200
100 install: all installhdrs
101 - $(INSTALL_DIR) $(LIBDIR)
102 - $(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
103 + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
104 + $(INSTALL_LIB) $(LIBCUPS) $(DESTDIR)$(LIBDIR)
105 if test $(LIBCUPS) = "libcups.so.2" -o $(LIBCUPS) = "libcups.sl.2"; then \
106 - $(RM) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
107 - $(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
108 + $(RM) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPS) .2`; \
109 + $(LN) $(LIBCUPS) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPS) .2`; \
111 if test $(LIBCUPS) = "libcups.2.dylib"; then \
112 - $(STRIP) -x $(LIBDIR)/$(LIBCUPS); \
113 - $(RM) $(LIBDIR)/libcups.dylib; \
114 - $(LN) $(LIBCUPS) $(LIBDIR)/libcups.dylib; \
115 + $(STRIP) -x $(DESTDIR)$(LIBDIR)/$(LIBCUPS); \
116 + $(RM) $(DESTDIR)$(LIBDIR)/libcups.dylib; \
117 + $(LN) $(LIBCUPS) $(DESTDIR)$(LIBDIR)/libcups.dylib; \
119 if test $(LIBCUPS) != "libcups.a"; then \
120 - $(INSTALL_LIB) libcups.a $(LIBDIR); \
121 + $(INSTALL_LIB) libcups.a $(DESTDIR)$(LIBDIR); \
123 - $(RANLIB) $(LIBDIR)/libcups.a
124 + $(RANLIB) $(DESTDIR)$(LIBDIR)/libcups.a
127 - $(INSTALL_DIR) $(INCLUDEDIR)/cups
128 + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/cups
129 for file in $(HEADERS); do \
130 - $(INSTALL_DATA) $$file $(INCLUDEDIR)/cups; \
131 + $(INSTALL_DATA) $$file $(DESTDIR)$(INCLUDEDIR)/cups; \
135 diff -urN cups-1.1.21rc1.org/data/Makefile cups-1.1.21rc1/data/Makefile
136 --- cups-1.1.21rc1.org/data/Makefile 2004-06-11 11:49:11.561913976 +0200
137 +++ cups-1.1.21rc1/data/Makefile 2004-06-11 11:49:30.048103648 +0200
142 - $(INSTALL_DIR) $(DATADIR)/banners
143 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/banners
144 for file in $(BANNERS); do \
145 - $(INSTALL_DATA) $$file $(DATADIR)/banners; \
146 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/banners; \
148 - $(INSTALL_DIR) $(DATADIR)/charsets
149 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/charsets
150 for file in $(CHARSETS); do \
151 - $(INSTALL_DATA) $$file $(DATADIR)/charsets; \
152 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/charsets; \
154 - $(INSTALL_DIR) $(DATADIR)/data
155 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/data
156 for file in $(DATAFILES); do \
157 - $(INSTALL_DATA) $$file $(DATADIR)/data; \
158 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/data; \
162 diff -urN cups-1.1.21rc1.org/doc/de/Makefile cups-1.1.21rc1/doc/de/Makefile
163 --- cups-1.1.21rc1.org/doc/de/Makefile 2004-06-11 11:49:11.657899384 +0200
164 +++ cups-1.1.21rc1/doc/de/Makefile 2004-06-11 11:49:30.052103040 +0200
169 - $(INSTALL_DIR) $(DOCDIR)/de
170 + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/de
171 for file in $(WEBPAGES); do \
172 - $(INSTALL_MAN) $$file $(DOCDIR)/de; \
173 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/de; \
175 - $(INSTALL_DIR) $(DOCDIR)/de/images
176 + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/de/images
177 for file in $(WEBIMAGES); do \
178 - $(INSTALL_MAN) $$file $(DOCDIR)/de/images; \
179 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/de/images; \
183 diff -urN cups-1.1.21rc1.org/doc/fr/Makefile cups-1.1.21rc1/doc/fr/Makefile
184 --- cups-1.1.21rc1.org/doc/fr/Makefile 2004-06-11 11:49:11.748885552 +0200
185 +++ cups-1.1.21rc1/doc/fr/Makefile 2004-06-11 11:49:30.054102736 +0200
186 @@ -105,21 +105,21 @@
190 - $(INSTALL_DIR) $(DOCDIR)/fr
191 + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/fr
192 for file in $(WEBPAGES); do \
193 - $(INSTALL_MAN) $$file $(DOCDIR)/fr; \
194 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/fr; \
196 - $(INSTALL_MAN) overview.html $(DOCDIR)/fr
197 - $(INSTALL_MAN) overview.pdf $(DOCDIR)/fr
198 + $(INSTALL_MAN) overview.html $(DESTDIR)$(DOCDIR)/fr
199 + $(INSTALL_MAN) overview.pdf $(DESTDIR)$(DOCDIR)/fr
200 for file in $(DOCUMENTS:.shtml=.html); do \
201 - $(INSTALL_MAN) $$file $(DOCDIR)/fr; \
202 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/fr; \
204 for file in $(DOCUMENTS:.shtml=.pdf); do \
205 - $(INSTALL_MAN) $$file $(DOCDIR)/fr; \
206 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/fr; \
208 - $(INSTALL_DIR) $(DOCDIR)/fr/images
209 + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/fr/images
210 for file in $(WEBIMAGES); do \
211 - $(INSTALL_MAN) $$file $(DOCDIR)/fr/images; \
212 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/fr/images; \
216 diff -urN cups-1.1.21rc1.org/doc/Makefile cups-1.1.21rc1/doc/Makefile
217 --- cups-1.1.21rc1.org/doc/Makefile 2004-06-11 11:49:11.658899232 +0200
218 +++ cups-1.1.21rc1/doc/Makefile 2004-06-11 11:49:30.050103344 +0200
219 @@ -125,21 +125,21 @@
223 - $(INSTALL_DIR) $(DOCDIR)
224 + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
225 for file in $(WEBPAGES); do \
226 - $(INSTALL_MAN) $$file $(DOCDIR); \
227 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \
229 - $(INSTALL_MAN) overview.html $(DOCDIR)
230 - $(INSTALL_MAN) overview.pdf $(DOCDIR)
231 + $(INSTALL_MAN) overview.html $(DESTDIR)$(DOCDIR)
232 + $(INSTALL_MAN) overview.pdf $(DESTDIR)$(DOCDIR)
233 for file in $(DOCUMENTS:.shtml=.html); do \
234 - $(INSTALL_MAN) $$file $(DOCDIR); \
235 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \
237 for file in $(DOCUMENTS:.shtml=.pdf); do \
238 - $(INSTALL_MAN) $$file $(DOCDIR); \
239 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \
241 - $(INSTALL_DIR) $(DOCDIR)/images
242 + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/images
243 for file in $(WEBIMAGES) $(DOCIMAGES); do \
244 - $(INSTALL_MAN) $$file $(DOCDIR)/images; \
245 + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/images; \
247 cd de; $(MAKE) $(MFLAGS) install
248 cd fr; $(MAKE) $(MFLAGS) install
249 diff -urN cups-1.1.21rc1.org/filter/Makefile cups-1.1.21rc1/filter/Makefile
250 --- cups-1.1.21rc1.org/filter/Makefile 2004-06-11 11:49:11.803877192 +0200
251 +++ cups-1.1.21rc1/filter/Makefile 2004-06-11 11:49:30.056102432 +0200
255 install: all installhdrs
256 - $(INSTALL_DIR) $(SERVERBIN)/filter
257 + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/filter
258 for file in $(TARGETS); do \
259 - $(INSTALL_BIN) $$file $(SERVERBIN)/filter; \
260 + $(INSTALL_BIN) $$file $(DESTDIR)$(SERVERBIN)/filter; \
262 - $(INSTALL_DIR) $(LIBDIR)
263 - $(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR)
264 + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
265 + $(INSTALL_LIB) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)
266 -if test $(LIBCUPSIMAGE) = "libcupsimage.so.2" -o $(LIBCUPSIMAGE) = "libcupsimage.sl.2"; then \
267 - $(RM) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
268 - $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
269 + $(RM) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
270 + $(LN) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
272 -if test $(LIBCUPSIMAGE) = "libcupsimage.2.dylib"; then \
273 - $(STRIP) -x $(LIBDIR)/$(LIBCUPSIMAGE); \
274 - $(RM) $(LIBDIR)/libcupsimage.dylib; \
275 - $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/libcupsimage.dylib; \
276 + $(STRIP) -x $(DESTDIR)$(LIBDIR)/$(LIBCUPSIMAGE); \
277 + $(RM) $(DESTDIR)$(LIBDIR)/libcupsimage.dylib; \
278 + $(LN) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)/libcupsimage.dylib; \
280 -if test $(LIBCUPSIMAGE) != "libcupsimage.a"; then \
281 - $(INSTALL_LIB) libcupsimage.a $(LIBDIR); \
282 + $(INSTALL_LIB) libcupsimage.a $(DESTDIR)$(LIBDIR); \
284 - $(RANLIB) $(LIBDIR)/libcupsimage.a
285 + $(RANLIB) $(DESTDIR)$(LIBDIR)/libcupsimage.a
288 - $(INSTALL_DIR) $(INCLUDEDIR)/cups
289 - $(INSTALL_DATA) image.h $(INCLUDEDIR)/cups
290 - $(INSTALL_DATA) raster.h $(INCLUDEDIR)/cups
291 + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/cups
292 + $(INSTALL_DATA) image.h $(DESTDIR)$(INCLUDEDIR)/cups
293 + $(INSTALL_DATA) raster.h $(DESTDIR)$(INCLUDEDIR)/cups
297 diff -urN cups-1.1.21rc1.org/fonts/Makefile cups-1.1.21rc1/fonts/Makefile
298 --- cups-1.1.21rc1.org/fonts/Makefile 2004-06-11 11:49:11.866867616 +0200
299 +++ cups-1.1.21rc1/fonts/Makefile 2004-06-11 11:49:30.057102280 +0200
304 - $(INSTALL_DIR) $(DATADIR)/fonts
305 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/fonts
306 for file in $(FONTS); do \
307 - $(INSTALL_DATA) $$file $(DATADIR)/fonts; \
308 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/fonts; \
312 diff -urN cups-1.1.21rc1.org/locale/Makefile cups-1.1.21rc1/locale/Makefile
313 --- cups-1.1.21rc1.org/locale/Makefile 2004-06-11 11:49:11.869867160 +0200
314 +++ cups-1.1.21rc1/locale/Makefile 2004-06-11 11:49:30.059101976 +0200
319 - $(INSTALL_DIR) $(LOCALEDIR)
320 + $(INSTALL_DIR) $(DESTDIR)$(LOCALEDIR)
321 for dir in $(LOCALES) ; do \
322 - $(INSTALL_DIR) $(LOCALEDIR)/$$dir ; \
323 - $(INSTALL_DATA) $$dir/cups_$$dir $(LOCALEDIR)/$$dir ; \
324 + $(INSTALL_DIR) $(DESTDIR)$(LOCALEDIR)/$$dir ; \
325 + $(INSTALL_DATA) $$dir/cups_$$dir $(DESTDIR)$(LOCALEDIR)/$$dir ; \
329 diff -urN cups-1.1.21rc1.org/Makefile cups-1.1.21rc1/Makefile
330 --- cups-1.1.21rc1.org/Makefile 2004-06-11 11:49:11.494924160 +0200
331 +++ cups-1.1.21rc1/Makefile 2004-06-11 11:49:30.036105472 +0200
333 echo Installing in templates...
334 (cd templates; $(MAKE) $(MFLAGS) install)
335 echo Installing cups-config script...
336 - $(INSTALL_DIR) $(BINDIR)
337 - $(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
338 - echo Installing startup script...
339 - if test "x$(INITDIR)" != "x"; then \
340 - $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \
341 - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
342 - $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc0.d; \
343 - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
344 - $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc2.d; \
345 - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
346 - $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc3.d; \
347 - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
348 - $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc5.d; \
349 - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
351 - if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
352 - $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
353 - if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
354 - $(INSTALL_SCRIPT) cups.osx $(BUILDROOT)$(INITDDIR)/PrintingServices; \
355 - $(INSTALL_DATA) cups.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
356 - $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
357 - $(INSTALL_DATA) cups.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
359 - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
362 + $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
363 + $(INSTALL_SCRIPT) cups-config $(DESTDIR)$(BINDIR)/cups-config
366 # Install source and header files...
367 diff -urN cups-1.1.21rc1.org/man/fr/Makefile cups-1.1.21rc1/man/fr/Makefile
368 --- cups-1.1.21rc1.org/man/fr/Makefile 2004-06-11 11:49:11.879865640 +0200
369 +++ cups-1.1.21rc1/man/fr/Makefile 2004-06-11 11:49:30.064101216 +0200
374 - $(INSTALL_DIR) $(MANDIR)/$(LANGUAGE)/man1
375 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man1
376 for file in $(MAN1); do \
377 - $(INSTALL_MAN) $$file $(MANDIR)/$(LANGUAGE)/man1/`basename $$file man`1; \
378 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man1/`basename $$file man`1; \
380 - $(RM) $(MANDIR)/$(LANGUAGE)/man1/cancel.1
381 - $(LN) lp.1 $(MANDIR)/$(LANGUAGE)/man1/cancel.1
382 - $(INSTALL_DIR) $(PMANDIR)/fr/man3
383 + $(RM) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man1/cancel.1
384 + $(LN) lp.1 $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man1/cancel.1
385 + $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/fr/man3
386 for file in $(MAN3); do \
387 - $(INSTALL_MAN) $$file $(PMANDIR)/fr/man3/`basename $$file man`3; \
388 + $(INSTALL_MAN) $$file $(DESTDIR)$(PMANDIR)/fr/man3/`basename $$file man`3; \
390 - $(INSTALL_DIR) $(MANDIR)/$(LANGUAGE)/man5
391 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man5
392 for file in $(MAN5); do \
393 - $(INSTALL_MAN) $$file $(MANDIR)/$(LANGUAGE)/man5/`basename $$file man`5; \
394 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man5/`basename $$file man`5; \
396 - $(INSTALL_DIR) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)
397 + $(INSTALL_DIR) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)
398 for file in $(MAN8); do \
399 - $(INSTALL_MAN) $$file $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
400 + $(INSTALL_MAN) $$file $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
402 - $(RM) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/reject.$(MAN8EXT)
403 - $(LN) accept.$(MAN8EXT) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/reject.$(MAN8EXT)
404 - $(RM) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/disable.$(MAN8EXT)
405 - $(LN) enable.$(MAN8EXT) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/disable.$(MAN8EXT)
406 - $(INSTALL_DIR) $(MANDIR)/$(LANGUAGE)/cat1
407 + $(RM) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/reject.$(MAN8EXT)
408 + $(LN) accept.$(MAN8EXT) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/reject.$(MAN8EXT)
409 + $(RM) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/disable.$(MAN8EXT)
410 + $(LN) enable.$(MAN8EXT) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/disable.$(MAN8EXT)
411 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat1
412 for file in $(CAT1); do \
413 - $(INSTALL_MAN) $$file $(MANDIR)/$(LANGUAGE)/cat1; \
414 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat1; \
416 - $(RM) $(MANDIR)/$(LANGUAGE)/cat1/cancel.$(CAT1EXT)
417 - $(LN) lp.$(CAT1EXT) $(MANDIR)/$(LANGUAGE)/cat1/cancel.$(CAT1EXT)
418 - $(INSTALL_DIR) $(PMANDIR)/fr/cat3
419 + $(RM) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat1/cancel.$(CAT1EXT)
420 + $(LN) lp.$(CAT1EXT) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat1/cancel.$(CAT1EXT)
421 + $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/fr/cat3
422 for file in $(CAT3); do \
423 - $(INSTALL_MAN) $$file $(PMANDIR)/fr/cat3; \
424 + $(INSTALL_MAN) $$file $(DESTDIR)$(PMANDIR)/fr/cat3; \
426 - $(INSTALL_DIR) $(MANDIR)/$(LANGUAGE)/cat5
427 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat5
428 for file in $(CAT5); do \
429 - $(INSTALL_MAN) $$file $(MANDIR)/$(LANGUAGE)/cat5; \
430 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat5; \
432 - $(INSTALL_DIR) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)
433 + $(INSTALL_DIR) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)
434 for file in $(CAT8); do \
435 - $(INSTALL_MAN) $$file $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT); \
436 + $(INSTALL_MAN) $$file $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT); \
438 - $(RM) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/reject.$(CAT8EXT)
439 - $(LN) accept.$(CAT8EXT) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/reject.$(CAT8EXT)
440 - $(RM) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/disable.$(CAT8EXT)
441 - $(LN) enable.$(CAT8EXT) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/disable.$(CAT8EXT)
442 + $(RM) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/reject.$(CAT8EXT)
443 + $(LN) accept.$(CAT8EXT) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/reject.$(CAT8EXT)
444 + $(RM) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/disable.$(CAT8EXT)
445 + $(LN) enable.$(CAT8EXT) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/disable.$(CAT8EXT)
449 diff -urN cups-1.1.21rc1.org/man/Makefile cups-1.1.21rc1/man/Makefile
450 --- cups-1.1.21rc1.org/man/Makefile 2004-06-11 11:49:11.900862448 +0200
451 +++ cups-1.1.21rc1/man/Makefile 2004-06-11 11:52:59.767221496 +0200
456 - $(INSTALL_DIR) $(MANDIR)/man1
457 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1
458 for file in $(MAN1); do \
459 - echo Installing $$file in $(MANDIR)/man1...; \
460 - $(INSTALL_MAN) $$file $(MANDIR)/man1/`basename $$file man`1; \
461 + echo Installing $$file in $(DESTDIR)$(MANDIR)/man1...; \
462 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/man1/`basename $$file man`1; \
464 - $(RM) $(MANDIR)/man1/cancel.1
465 - $(LN) lp.1 $(MANDIR)/man1/cancel.1
466 - $(INSTALL_DIR) $(PMANDIR)/man3
467 + $(RM) $(DESTDIR)$(MANDIR)/man1/cancel.1
468 + $(LN) lp.1 $(DESTDIR)$(MANDIR)/man1/cancel.1
469 + $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/man3
470 for file in $(MAN3); do \
471 - echo Installing $$file in $(PMANDIR)/man3...; \
472 - $(INSTALL_MAN) $$file $(PMANDIR)/man3/`basename $$file man`3; \
473 + echo Installing $$file in $(DESTDIR)$(PMANDIR)/man3...; \
474 + $(INSTALL_MAN) $$file $(DESTDIR)$(PMANDIR)/man3/`basename $$file man`3; \
476 - $(INSTALL_DIR) $(MANDIR)/man5
477 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man5
478 for file in $(MAN5); do \
479 - echo Installing $$file in $(MANDIR)/man5...; \
480 - $(INSTALL_MAN) $$file $(MANDIR)/man5/`basename $$file man`5; \
481 + echo Installing $$file in $(DESTDIR)$(MANDIR)/man5...; \
482 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/man5/`basename $$file man`5; \
484 - $(INSTALL_DIR) $(AMANDIR)/man$(MAN8EXT)
485 + $(INSTALL_DIR) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)
486 for file in $(MAN8); do \
487 - echo Installing $$file in $(AMANDIR)/man$(MAN8EXT)...; \
488 - $(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
489 + echo Installing $$file in $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)...; \
490 + $(INSTALL_MAN) $$file $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
492 - $(RM) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
493 - $(LN) accept.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
494 - $(RM) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
495 - $(LN) enable.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
496 - $(INSTALL_DIR) $(MANDIR)/cat1
497 + $(RM) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
498 + $(LN) accept.$(MAN8EXT) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
499 + $(RM) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
500 + $(LN) enable.$(MAN8EXT) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
501 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/cat1
502 for file in $(CAT1); do \
503 - echo Installing $$file in $(MANDIR)/cat1...; \
504 - $(INSTALL_MAN) $$file $(MANDIR)/cat1; \
505 + echo Installing $$file in $(DESTDIR)$(MANDIR)/cat1...; \
506 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/cat1; \
508 - $(RM) $(MANDIR)/cat1/cancel.$(CAT1EXT)
509 - $(LN) lp.$(CAT1EXT) $(MANDIR)/cat1/cancel.$(CAT1EXT)
510 - $(INSTALL_DIR) $(PMANDIR)/cat3
511 + $(RM) $(DESTDIR)$(MANDIR)/cat1/cancel.$(CAT1EXT)
512 + $(LN) lp.$(CAT1EXT) $(DESTDIR)$(MANDIR)/cat1/cancel.$(CAT1EXT)
513 + $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/cat3
514 for file in $(CAT3); do \
515 - echo Installing $$file in $(PMANDIR)/cat3...; \
516 - $(INSTALL_MAN) $$file $(PMANDIR)/cat3; \
517 + echo Installing $$file in $(DESTDIR)$(PMANDIR)/cat3...; \
518 + $(INSTALL_MAN) $$file $(DESTDIR)$(PMANDIR)/cat3; \
520 - $(INSTALL_DIR) $(MANDIR)/cat5
521 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/cat5
522 for file in $(CAT5); do \
523 - echo Installing $$file in $(MANDIR)/cat5...; \
524 - $(INSTALL_MAN) $$file $(MANDIR)/cat5; \
525 + echo Installing $$file in $(DESTDIR)$(MANDIR)/cat5...; \
526 + $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/cat5; \
528 - $(INSTALL_DIR) $(AMANDIR)/cat$(MAN8EXT)
529 + $(INSTALL_DIR) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)
530 for file in $(CAT8); do \
531 - echo Installing $$file in $(AMANDIR)/cat$(MAN8EXT)...; \
532 - $(INSTALL_MAN) $$file $(AMANDIR)/cat$(MAN8EXT); \
533 + echo Installing $$file in $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)...; \
534 + $(INSTALL_MAN) $$file $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT); \
536 - $(RM) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
537 - $(LN) accept.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
538 - $(RM) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
539 - $(LN) enable.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
540 + $(RM) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
541 + $(LN) accept.$(CAT8EXT) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
542 + $(RM) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
543 + $(LN) enable.$(CAT8EXT) $(DESTDIR)$(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
544 for dir in $(LANGDIRS); do \
545 echo "Installing all in man/$$dir..."; \
546 (cd $$dir; $(MAKE) $(MFLAGS) install); \
547 diff -urN cups-1.1.21rc1.org/pdftops/Makefile cups-1.1.21rc1/pdftops/Makefile
548 --- cups-1.1.21rc1.org/pdftops/Makefile 2004-06-11 11:49:11.986849376 +0200
549 +++ cups-1.1.21rc1/pdftops/Makefile 2004-06-11 11:49:30.066100912 +0200
554 - $(INSTALL_DIR) $(SERVERBIN)/filter
555 - $(INSTALL_BIN) pdftops $(SERVERBIN)/filter
556 + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/filter
557 + $(INSTALL_BIN) pdftops $(DESTDIR)$(SERVERBIN)/filter
561 diff -urN cups-1.1.21rc1.org/ppd/Makefile cups-1.1.21rc1/ppd/Makefile
562 --- cups-1.1.21rc1.org/ppd/Makefile 2004-06-11 11:49:12.008846032 +0200
563 +++ cups-1.1.21rc1/ppd/Makefile 2004-06-11 11:49:30.068100608 +0200
568 - $(INSTALL_DIR) $(DATADIR)/model
569 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/model
570 for file in $(FILES); do \
571 - $(INSTALL_DATA) $$file $(DATADIR)/model; \
572 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/model; \
576 diff -urN cups-1.1.21rc1.org/scheduler/Makefile cups-1.1.21rc1/scheduler/Makefile
577 --- cups-1.1.21rc1.org/scheduler/Makefile 2004-06-11 11:49:12.029842840 +0200
578 +++ cups-1.1.21rc1/scheduler/Makefile 2004-06-11 11:49:30.069100456 +0200
583 - $(INSTALL_DIR) $(SBINDIR)
584 - $(INSTALL_BIN) cupsd $(SBINDIR)
585 - $(INSTALL_DIR) $(SERVERBIN)/daemon
586 - $(INSTALL_BIN) cups-lpd $(SERVERBIN)/daemon
587 - $(INSTALL_BIN) cups-polld $(SERVERBIN)/daemon
588 - $(INSTALL_DIR) -m 711 $(SERVERROOT)/certs
589 - $(INSTALL_DIR) $(SERVERROOT)/interfaces
590 - $(INSTALL_DIR) $(SERVERROOT)/ppd
591 - $(INSTALL_DIR) $(LOGDIR)
592 - $(INSTALL_DIR) -m 710 $(REQUESTS)
593 - $(INSTALL_DIR) -m 1770 $(REQUESTS)/tmp
594 + $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
595 + $(INSTALL_BIN) cupsd $(DESTDIR)$(SBINDIR)
596 + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/daemon
597 + $(INSTALL_BIN) cups-lpd $(DESTDIR)$(SERVERBIN)/daemon
598 + $(INSTALL_BIN) cups-polld $(DESTDIR)$(SERVERBIN)/daemon
599 + $(INSTALL_DIR) -m 711 $(DESTDIR)$(SERVERROOT)/certs
600 + $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/interfaces
601 + $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/ppd
602 + $(INSTALL_DIR) $(DESTDIR)$(LOGDIR)
603 + $(INSTALL_DIR) -m 710 $(DESTDIR)$(REQUESTS)
604 + $(INSTALL_DIR) -m 1770 $(DESTDIR)$(REQUESTS)/tmp
608 diff -urN cups-1.1.21rc1.org/systemv/Makefile cups-1.1.21rc1/systemv/Makefile
609 --- cups-1.1.21rc1.org/systemv/Makefile 2004-06-11 11:49:12.240810768 +0200
610 +++ cups-1.1.21rc1/systemv/Makefile 2004-06-11 11:49:30.072100000 +0200
615 - $(INSTALL_DIR) $(SBINDIR)
616 - $(INSTALL_BIN) accept $(SBINDIR)
617 - $(RM) $(SBINDIR)/reject
618 - $(LN) accept $(SBINDIR)/reject
619 - $(INSTALL_BIN) cupsaddsmb $(SBINDIR)
620 - $(INSTALL_BIN) lpadmin $(SBINDIR)
621 - $(INSTALL_BIN) lpinfo $(SBINDIR)
622 - $(INSTALL_BIN) lpmove $(SBINDIR)
623 - $(INSTALL_DIR) $(BINDIR)
624 - $(INSTALL_BIN) cancel $(BINDIR)
625 - $(INSTALL_BIN) cupstestppd $(BINDIR)
626 - $(RM) $(BINDIR)/disable
627 - $(LN) ../sbin/accept $(BINDIR)/disable
628 - $(RM) $(BINDIR)/enable
629 - $(LN) ../sbin/accept $(BINDIR)/enable
630 - $(INSTALL_BIN) lp $(BINDIR)
631 - $(INSTALL_BIN) lpoptions $(BINDIR)
632 - $(INSTALL_BIN) lpstat $(BINDIR)
633 - $(INSTALL_BIN) lppasswd $(BINDIR)
634 - -$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR)
635 + $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
636 + $(INSTALL_BIN) accept $(DESTDIR)$(SBINDIR)
637 + $(RM) $(DESTDIR)$(SBINDIR)/reject
638 + $(LN) accept $(DESTDIR)$(SBINDIR)/reject
639 + $(INSTALL_BIN) cupsaddsmb $(DESTDIR)$(SBINDIR)
640 + $(INSTALL_BIN) lpadmin $(DESTDIR)$(SBINDIR)
641 + $(INSTALL_BIN) lpinfo $(DESTDIR)$(SBINDIR)
642 + $(INSTALL_BIN) lpmove $(DESTDIR)$(SBINDIR)
643 + $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
644 + $(INSTALL_BIN) cancel $(DESTDIR)$(BINDIR)
645 + $(INSTALL_BIN) cupstestppd $(DESTDIR)$(BINDIR)
646 + $(RM) $(DESTDIR)$(BINDIR)/disable
647 + $(LN) ../sbin/accept $(DESTDIR)$(BINDIR)/disable
648 + $(RM) $(DESTDIR)$(BINDIR)/enable
649 + $(LN) ../sbin/accept $(DESTDIR)$(BINDIR)/enable
650 + $(INSTALL_BIN) lp $(DESTDIR)$(BINDIR)
651 + $(INSTALL_BIN) lpoptions $(DESTDIR)$(BINDIR)
652 + $(INSTALL_BIN) lpstat $(DESTDIR)$(BINDIR)
653 + $(INSTALL_BIN) lppasswd $(DESTDIR)$(BINDIR)
654 + -$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(DESTDIR)$(BINDIR)
658 diff -urN cups-1.1.21rc1.org/templates/be/Makefile cups-1.1.21rc1/templates/be/Makefile
659 --- cups-1.1.21rc1.org/templates/be/Makefile 2004-06-11 11:49:12.246809856 +0200
660 +++ cups-1.1.21rc1/templates/be/Makefile 2004-06-11 11:55:44.852124776 +0200
665 - $(INSTALL_DIR) $(DATADIR)/templates/be
666 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/templates/be
667 for file in $(FILES); do \
668 - $(INSTALL_DATA) $$file $(DATADIR)/templates/be; \
669 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/templates/be; \
673 diff -urN cups-1.1.21rc1.org/templates/de/Makefile cups-1.1.21rc1/templates/de/Makefile
674 --- cups-1.1.21rc1.org/templates/de/Makefile 2004-06-11 11:49:12.288803472 +0200
675 +++ cups-1.1.21rc1/templates/de/Makefile 2004-06-11 11:49:30.077099240 +0200
680 - $(INSTALL_DIR) $(DATADIR)/templates/de
681 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/templates/de
682 for file in $(FILES); do \
683 - $(INSTALL_DATA) $$file $(DATADIR)/templates/de; \
684 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/templates/de; \
688 diff -urN cups-1.1.21rc1.org/templates/fr/Makefile cups-1.1.21rc1/templates/fr/Makefile
689 --- cups-1.1.21rc1.org/templates/fr/Makefile 2004-06-11 11:49:12.366791616 +0200
690 +++ cups-1.1.21rc1/templates/fr/Makefile 2004-06-11 11:49:30.080098784 +0200
695 - $(INSTALL_DIR) $(DATADIR)/templates/fr
696 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/templates/fr
697 for file in $(FILES); do \
698 - $(INSTALL_DATA) $$file $(DATADIR)/templates/fr; \
699 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/templates/fr; \
703 diff -urN cups-1.1.21rc1.org/templates/Makefile cups-1.1.21rc1/templates/Makefile
704 --- cups-1.1.21rc1.org/templates/Makefile 2004-06-11 11:49:12.332796784 +0200
705 +++ cups-1.1.21rc1/templates/Makefile 2004-06-11 11:49:30.074099696 +0200
710 - $(INSTALL_DIR) $(DATADIR)/templates
711 + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/templates
712 for file in $(FILES); do \
713 - $(INSTALL_DATA) $$file $(DATADIR)/templates; \
714 + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/templates; \
716 cd be; $(MAKE) $(MFLAGS) install
717 cd de; $(MAKE) $(MFLAGS) install