]> git.pld-linux.org Git - packages/cups.git/blame - cups-DESTDIR.patch
projects / packages / cups.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- conflicts with ghostscript < 7.05.4 (i.e. non-espgs)
[packages/cups.git] / cups-DESTDIR.patch
CommitLineData
2826d567
AF		 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
d5b299a2 3@@ -59,12 +59,12 @@
d1d5300a 4 #
5
d5b299a2 6 install: all
bfb43493 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; \
d1d5300a 12 done
bfb43493 13- $(RM) $(SERVERBIN)/backend/http
14- $(LN) ipp $(SERVERBIN)/backend/http
d5b299a2
AM		 15+ $(RM) $(DESTDIR)$(SERVERBIN)/backend/http
16+ $(LN) ipp $(DESTDIR)$(SERVERBIN)/backend/http
d1d5300a 17
18
19 #
2826d567
AF		 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
d5b299a2 22@@ -56,12 +56,12 @@
d1d5300a 23 #
24
d5b299a2 25 install: all
bfb43493 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)
d1d5300a 38
39
40 #
2826d567
AF		 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
d5b299a2 43@@ -58,9 +58,9 @@
d1d5300a 44 #
45
d5b299a2 46 install: all
bfb43493 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; \
52 done
d1d5300a 53
bfb43493 54
2826d567
AF		 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
d5b299a2 57@@ -51,23 +51,23 @@
d1d5300a 58 #
59
60 install:
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 ; \
d5b299a2
AM		 66+ if test -r $(DESTDIR)$(SERVERROOT)/$$file ; then \
67+ $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT)/$$file.N ; \
68 else \
d1d5300a 69- $(INSTALL_DATA) $$file $(SERVERROOT) ; \
d5b299a2
AM		 70+ $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT) ; \
71 fi ; \
d1d5300a 72 done
73 for file in $(REPLACE); do \
74- if test -r $(SERVERROOT)/$$file ; then \
75- $(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
d5b299a2
AM		 76+ if test -r $(DESTDIR)$(SERVERROOT)/$$file ; then \
77+ $(MV) $(DESTDIR)$(SERVERROOT)/$$file $(DESTDIR)$(SERVERROOT)/$$file.O ; \
78 fi ; \
d1d5300a 79- $(INSTALL_DATA) $$file $(SERVERROOT) ; \
80+ $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT) ; \
81 done
d5b299a2
AM		 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; \
87 fi
d1d5300a 88
89
2826d567
AF		 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
d5b299a2 92@@ -79,26 +79,26 @@
d1d5300a 93 #
94
d5b299a2 95 install: all installhdrs
d1d5300a 96- $(INSTALL_DIR) $(LIBDIR)
97- $(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
d5b299a2
AM		 98+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
99+ $(INSTALL_LIB) $(LIBCUPS) $(DESTDIR)$(LIBDIR)
100 if test $(LIBCUPS) = "libcups.so.2" -o $(LIBCUPS) = "libcups.sl.2"; then \
bfb43493 101- $(RM) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
102- $(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
d5b299a2
AM		 103+ $(RM) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPS) .2`; \
104+ $(LN) $(LIBCUPS) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPS) .2`; \
105 fi
106 if test $(LIBCUPS) = "libcups.2.dylib"; then \
107- $(STRIP) -x $(LIBDIR)/$(LIBCUPS); \
fb198dce 108- $(RM) $(LIBDIR)/libcups.dylib; \
109- $(LN) $(LIBCUPS) $(LIBDIR)/libcups.dylib; \
d5b299a2
AM		 110+ $(STRIP) -x $(DESTDIR)$(LIBDIR)/$(LIBCUPS); \
111+ $(RM) $(DESTDIR)$(LIBDIR)/libcups.dylib; \
112+ $(LN) $(LIBCUPS) $(DESTDIR)$(LIBDIR)/libcups.dylib; \
113 fi
114 if test $(LIBCUPS) != "libcups.a"; then \
bfb43493 115- $(INSTALL_LIB) libcups.a $(LIBDIR); \
d5b299a2
AM		 116+ $(INSTALL_LIB) libcups.a $(DESTDIR)$(LIBDIR); \
117 fi
118- $(RANLIB) $(LIBDIR)/libcups.a
119+ $(RANLIB) $(DESTDIR)$(LIBDIR)/libcups.a
120
121 installhdrs:
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; \
127 done
d1d5300a 128
fb198dce 129
2826d567
AF		 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
d5b299a2 132@@ -85,17 +85,17 @@
d1d5300a 133 #
134
135 install:
bfb43493 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; \
141 done
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; \
147 done
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; \
153 done
d1d5300a 154
d5b299a2 155
2826d567
AF		 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 @@
d1d5300a 159 #
160
161 install:
d5b299a2
AM		 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; \
167 done
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; \
175 done
176 for file in $(DOCUMENTS:.shtml=.pdf); do \
177- $(INSTALL_MAN) $$file $(DOCDIR)/fr; \
178+ $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/fr; \
179 done
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; \
185 done
186
187
2826d567
AF		 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
71bac56b
AF		 190@@ -123,21 +123,21 @@
191 #
192
193 install:
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); \
199 done
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); \
207 done
208 for file in $(DOCUMENTS:.shtml=.pdf); do \
209- $(INSTALL_MAN) $$file $(DOCDIR); \
210+ $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \
211 done
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; \
217 done
218 cd fr; $(MAKE) $(MFLAGS) install
219
2826d567
AF		 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
d5b299a2
AM		 222@@ -70,30 +70,30 @@
223 #
224
225 install: all installhdrs
bfb43493 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; \
231 done
d1d5300a 232- $(INSTALL_DIR) $(LIBDIR)
233- $(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR)
d5b299a2
AM		 234+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
235+ $(INSTALL_LIB) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)
236 -if test $(LIBCUPSIMAGE) = "libcupsimage.so.2" -o $(LIBCUPSIMAGE) = "libcupsimage.sl.2"; then \
bfb43493 237- $(RM) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
238- $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
d5b299a2
AM		 239+ $(RM) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
240+ $(LN) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
241 fi
242 -if test $(LIBCUPSIMAGE) = "libcupsimage.2.dylib"; then \
243- $(STRIP) -x $(LIBDIR)/$(LIBCUPSIMAGE); \
fb198dce 244- $(RM) $(LIBDIR)/libcupsimage.dylib; \
245- $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/libcupsimage.dylib; \
d5b299a2
AM		 246+ $(STRIP) -x $(DESTDIR)$(LIBDIR)/$(LIBCUPSIMAGE); \
247+ $(RM) $(DESTDIR)$(LIBDIR)/libcupsimage.dylib; \
248+ $(LN) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)/libcupsimage.dylib; \
249 fi
250 -if test $(LIBCUPSIMAGE) != "libcupsimage.a"; then \
251- $(INSTALL_LIB) libcupsimage.a $(LIBDIR); \
252+ $(INSTALL_LIB) libcupsimage.a $(DESTDIR)$(LIBDIR); \
253 fi
254- $(RANLIB) $(LIBDIR)/libcupsimage.a
255+ $(RANLIB) $(DESTDIR)$(LIBDIR)/libcupsimage.a
256
257 installhdrs:
d1d5300a 258- $(INSTALL_DIR) $(INCLUDEDIR)/cups
23db0460 259- $(INSTALL_DATA) image.h $(INCLUDEDIR)/cups
d1d5300a 260- $(INSTALL_DATA) raster.h $(INCLUDEDIR)/cups
d1d5300a 261+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/cups
d5b299a2
AM		 262+ $(INSTALL_DATA) image.h $(DESTDIR)$(INCLUDEDIR)/cups
263+ $(INSTALL_DATA) raster.h $(DESTDIR)$(INCLUDEDIR)/cups
264
fb198dce 265
d1d5300a 266 #
2826d567
AF		 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
d5b299a2 269@@ -51,9 +51,9 @@
d1d5300a 270 #
271
272 install:
bfb43493 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; \
278 done
d1d5300a 279
280
2826d567
AF		 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
d5b299a2 283@@ -51,10 +51,10 @@
d1d5300a 284 #
285
286 install:
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 ; \
294 done
295
296
2826d567
AF		 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
d5b299a2
AM		 299@@ -60,50 +60,50 @@
300 #
301
302 install: all
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; \
308 done
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; \
318 done
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; \
324 done
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); \
330 done
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; \
344 done
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; \
354 done
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; \
360 done
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); \
366 done
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)
fb198dce 375
d1d5300a 376
377 #
2826d567
AF		 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
71bac56b
AF		 380@@ -68,50 +68,50 @@
381 #
382
383 install: all
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; \
389 done
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; \
399 done
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; \
405 done
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); \
411 done
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; \
425 done
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; \
435 done
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; \
441 done
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); \
447 done
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); \
2826d567
AF		 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
461@@ -91,8 +91,8 @@
d1d5300a 462 #
463
d5b299a2 464 install: all
d1d5300a 465- $(INSTALL_DIR) $(SERVERBIN)/filter
466- $(INSTALL_BIN) pdftops $(SERVERBIN)/filter
467+ $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/filter
468+ $(INSTALL_BIN) pdftops $(DESTDIR)$(SERVERBIN)/filter
469
470
471 #
2826d567
AF		 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
bfb43493 474@@ -52,9 +52,9 @@
d1d5300a 475 #
476
477 install:
bfb43493 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; \
483 done
484
485
2826d567
AF		 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
d5b299a2 488@@ -60,17 +60,17 @@
d1d5300a 489 #
bfb43493 490
d5b299a2 491 install: all
bfb43493 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
d5b299a2 497- $(INSTALL_DIR) -m 711 $(SERVERROOT)/certs
bfb43493 498- $(INSTALL_DIR) $(SERVERROOT)/interfaces
499- $(INSTALL_DIR) $(SERVERROOT)/ppd
500- $(INSTALL_DIR) $(LOGDIR)
d5b299a2
AM		 501- $(INSTALL_DIR) -m 700 $(REQUESTS)
502- $(INSTALL_DIR) -m 1700 $(REQUESTS)/tmp
bfb43493 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
d5b299a2 508+ $(INSTALL_DIR) -m 711 $(DESTDIR)$(SERVERROOT)/certs
bfb43493 509+ $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/interfaces
510+ $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/ppd
511+ $(INSTALL_DIR) $(DESTDIR)$(LOGDIR)
d5b299a2
AM		 512+ $(INSTALL_DIR) -m 700 $(DESTDIR)$(REQUESTS)
513+ $(INSTALL_DIR) -m 1700 $(DESTDIR)$(REQUESTS)/tmp
bfb43493 514
515
516 #
2826d567
AF		 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
519@@ -59,26 +59,26 @@
bfb43493 520 #
521
d5b299a2
AM		 522 install: all
523- $(INSTALL_DIR) $(SBINDIR)
bfb43493 524- $(INSTALL_BIN) accept $(SBINDIR)
525- $(RM) $(SBINDIR)/reject
526- $(LN) accept $(SBINDIR)/reject
fb198dce 527- $(INSTALL_BIN) cupsaddsmb $(SBINDIR)
bfb43493 528- $(INSTALL_BIN) lpadmin $(SBINDIR)
529- $(INSTALL_BIN) lpinfo $(SBINDIR)
530- $(INSTALL_BIN) lpmove $(SBINDIR)
d5b299a2 531- $(INSTALL_DIR) $(BINDIR)
bfb43493 532- $(INSTALL_BIN) cancel $(BINDIR)
2826d567 533- $(INSTALL_BIN) cupstestppd $(SBINDIR)
bfb43493 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)
d5b299a2
AM		 541- $(INSTALL_BIN) lppasswd $(BINDIR)
542- -$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR)
543+ $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
bfb43493 544+ $(INSTALL_BIN) accept $(DESTDIR)$(SBINDIR)
d5b299a2
AM		 545+ $(RM) $(DESTDIR)$(SBINDIR)/reject
546+ $(LN) accept $(DESTDIR)$(SBINDIR)/reject
fb198dce 547+ $(INSTALL_BIN) cupsaddsmb $(DESTDIR)$(SBINDIR)
bfb43493 548+ $(INSTALL_BIN) lpadmin $(DESTDIR)$(SBINDIR)
549+ $(INSTALL_BIN) lpinfo $(DESTDIR)$(SBINDIR)
550+ $(INSTALL_BIN) lpmove $(DESTDIR)$(SBINDIR)
d5b299a2 551+ $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
bfb43493 552+ $(INSTALL_BIN) cancel $(DESTDIR)$(BINDIR)
2826d567 553+ $(INSTALL_BIN) cupstestppd $(DESTDIR)$(SBINDIR)
d5b299a2
AM		 554+ $(RM) $(DESTDIR)$(BINDIR)/disable
555+ $(LN) ../sbin/accept $(DESTDIR)$(BINDIR)/disable
556+ $(RM) $(DESTDIR)$(BINDIR)/enable
557+ $(LN) ../sbin/accept $(DESTDIR)$(BINDIR)/enable
bfb43493 558+ $(INSTALL_BIN) lp $(DESTDIR)$(BINDIR)
559+ $(INSTALL_BIN) lpoptions $(DESTDIR)$(BINDIR)
560+ $(INSTALL_BIN) lpstat $(DESTDIR)$(BINDIR)
561+ $(INSTALL_BIN) lppasswd $(DESTDIR)$(BINDIR)
d5b299a2 562+ -$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(DESTDIR)$(BINDIR)
bfb43493 563
564
565 #
2826d567
AF		 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
71bac56b 568@@ -94,9 +94,9 @@
d1d5300a 569 #
570
571 install:
71bac56b
AF		 572- $(INSTALL_DIR) $(DATADIR)/templates/fr
573+ $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/templates/fr
bfb43493 574 for file in $(FILES); do \
71bac56b
AF		 575- $(INSTALL_DATA) $$file $(DATADIR)/templates/fr; \
576+ $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/templates/fr; \
bfb43493 577 done
d5b299a2 578
71bac56b 579
2826d567
AF		 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
71bac56b 582@@ -95,9 +95,9 @@
d5b299a2
AM		 583 #
584
585 install:
71bac56b
AF		 586- $(INSTALL_DIR) $(DATADIR)/templates
587+ $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/templates
d5b299a2 588 for file in $(FILES); do \
71bac56b
AF		 589- $(INSTALL_DATA) $$file $(DATADIR)/templates; \
590+ $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/templates; \
d5b299a2 591 done
71bac56b 592 cd fr; $(MAKE) $(MFLAGS) install
d1d5300a 593
2826d567
AF		 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
71bac56b
AF		 596@@ -87,32 +87,8 @@
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; \
614- fi
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; \
622- else \
623- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
624- fi \
625- fi
626+ $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
627+ $(INSTALL_SCRIPT) cups-config $(DESTDIR)$(BINDIR)/cups-config
d1d5300a 628
71bac56b
AF		 629 #
630 # Install source and header files...
USB backend for CUPS
This page took 0.207222 seconds and 4 git commands to generate.