]> 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
- Release 3.
[packages/cups.git] / cups-DESTDIR.patch
CommitLineData
bfb43493 1diff -Nru cups-1.1.10/Makefile cups-1.1.10.new/Makefile
2--- cups-1.1.10/Makefile Mon Aug 6 21:37:08 2001
3+++ cups-1.1.10.new/Makefile Sun Sep 2 19:49:29 2001
4@@ -74,24 +74,6 @@
5 (cd ppd; $(MAKE) $(MFLAGS) install)
6 echo Installing in templates...
7 (cd templates; $(MAKE) $(MFLAGS) install)
8- echo Installing startup script...
9- if test "x$(INITDIR)" != "x"; then \
10- $(INSTALL_DIR) $(prefix)/$(INITDIR)/init.d; \
11- $(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDIR)/init.d/cups; \
12- $(INSTALL_DIR) $(prefix)/$(INITDIR)/rc0.d; \
13- $(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDIR)/rc0.d/K00cups; \
14- $(INSTALL_DIR) $(prefix)/$(INITDIR)/rc2.d; \
15- $(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDIR)/rc2.d/S99cups; \
16- $(INSTALL_DIR) $(prefix)/$(INITDIR)/rc3.d; \
17- $(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDIR)/rc3.d/S99cups; \
18- $(INSTALL_DIR) $(prefix)/$(INITDIR)/rc5.d; \
19- $(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDIR)/rc5.d/S99cups; \
20- fi
21- if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
22- $(INSTALL_DIR) $(prefix)/$(INITDDIR); \
23- $(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDDIR)/cups; \
24- fi
25-
d1d5300a 26
27 #
bfb43493 28 # Run the test suite...
29diff -Nru cups-1.1.10/backend/Makefile cups-1.1.10.new/backend/Makefile
30--- cups-1.1.10/backend/Makefile Tue Jul 24 21:56:41 2001
31+++ cups-1.1.10.new/backend/Makefile Sun Sep 2 19:50:56 2001
32@@ -49,12 +49,11 @@
d1d5300a 33 #
34
35 install:
bfb43493 36- $(INSTALL_DIR) $(SERVERBIN)/backend
37+ $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/backend
38 for file in $(BACKENDS); do \
39- $(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
40+ $(INSTALL_BIN) $$file $(DESTDIR)$(SERVERBIN)/backend; \
d1d5300a 41 done
bfb43493 42- $(RM) $(SERVERBIN)/backend/http
43- $(LN) ipp $(SERVERBIN)/backend/http
44+ $(LN) -sf ipp $(DESTDIR)$(SERVERBIN)/backend/http
d1d5300a 45
46
47 #
bfb43493 48diff -Nru cups-1.1.10/berkeley/Makefile cups-1.1.10.new/berkeley/Makefile
49--- cups-1.1.10/berkeley/Makefile Thu Jul 19 22:17:51 2001
50+++ cups-1.1.10.new/berkeley/Makefile Sun Sep 2 19:51:27 2001
51@@ -48,12 +48,12 @@
d1d5300a 52 #
53
54 install:
bfb43493 55- $(INSTALL_DIR) $(BINDIR)
56- $(INSTALL_BIN) lpq $(BINDIR)
57- $(INSTALL_BIN) lpr $(BINDIR)
58- $(INSTALL_BIN) lprm $(BINDIR)
59- $(INSTALL_DIR) $(SBINDIR)
60- $(INSTALL_BIN) lpc $(SBINDIR)
61+ $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
62+ $(INSTALL_BIN) lpq $(DESTDIR)$(BINDIR)
63+ $(INSTALL_BIN) lpr $(DESTDIR)$(BINDIR)
64+ $(INSTALL_BIN) lprm $(DESTDIR)$(BINDIR)
65+ $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
66+ $(INSTALL_BIN) lpc $(DESTDIR)$(SBINDIR)
d1d5300a 67
68
69 #
bfb43493 70diff -Nru cups-1.1.10/cgi-bin/Makefile cups-1.1.10.new/cgi-bin/Makefile
71--- cups-1.1.10/cgi-bin/Makefile Thu Jul 19 22:17:51 2001
72+++ cups-1.1.10.new/cgi-bin/Makefile Sun Sep 2 19:51:48 2001
73@@ -50,9 +50,9 @@
d1d5300a 74 #
75
76 install:
bfb43493 77- $(INSTALL_DIR) $(SERVERBIN)/cgi-bin
78+ $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/cgi-bin
79 for file in $(CGIS); do \
80- $(INSTALL_BIN) $$file $(SERVERBIN)/cgi-bin; \
81+ $(INSTALL_BIN) $$file $(DESTDIR)$(SERVERBIN)/cgi-bin; \
82 done
d1d5300a 83
bfb43493 84
85diff -Nru cups-1.1.10/conf/Makefile cups-1.1.10.new/conf/Makefile
86--- cups-1.1.10/conf/Makefile Wed Jun 27 23:53:08 2001
87+++ cups-1.1.10.new/conf/Makefile Sun Sep 2 19:40:12 2001
d1d5300a 88@@ -51,19 +51,12 @@
89 #
90
91 install:
92- $(INSTALL_DIR) $(SERVERROOT)
93+ $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)
94 for file in $(KEEP); do \
95- if test -r $(SERVERROOT)/$$file ; then \
96- $(INSTALL_DATA) $$file $(SERVERROOT)/$$file.N ; \
97- else \
98- $(INSTALL_DATA) $$file $(SERVERROOT) ; \
99- fi ; \
100+ $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT) ; \
101 done
102 for file in $(REPLACE); do \
103- if test -r $(SERVERROOT)/$$file ; then \
104- $(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
105- fi ; \
106- $(INSTALL_DATA) $$file $(SERVERROOT) ; \
107+ $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT) ; \
108 done
109
110
bfb43493 111diff -Nru cups-1.1.10/cups/Makefile cups-1.1.10.new/cups/Makefile
112--- cups-1.1.10/cups/Makefile Mon Aug 6 21:37:09 2001
113+++ cups-1.1.10.new/cups/Makefile Sun Sep 2 19:53:05 2001
114@@ -68,21 +68,14 @@
d1d5300a 115 #
116
117 install: all
118- $(INSTALL_DIR) $(INCLUDEDIR)/cups
bfb43493 119+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/cups
120 for file in $(HEADERS); do \
121- $(INSTALL_DATA) $$file $(INCLUDEDIR)/cups; \
122+ $(INSTALL_DATA) $$file $(DESTDIR)$(INCLUDEDIR)/cups; \
123 done
d1d5300a 124- $(INSTALL_DIR) $(LIBDIR)
125- $(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
126- if test $(LIBCUPS) = "libcups.so.2" -o $(LIBCUPS) = "libcups.sl.2"; then \
bfb43493 127- $(INSTALL_LIB) libcups.a $(LIBDIR); \
128- $(RM) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
129- $(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
d1d5300a 130- fi
bfb43493 131- if test $(LIBCUPS) = "libcups_s.a"; then \
132- $(INSTALL_LIB) libcups.a $(LIBDIR); \
133- fi
134-
d1d5300a 135+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
136+ $(INSTALL_LIB) $(LIBCUPS) $(DESTDIR)$(LIBDIR)
ed626ea8 137+ $(LN) $(LIBCUPS) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPS) .2`
d1d5300a 138+ $(INSTALL_LIB) libcups.a $(DESTDIR)$(LIBDIR)
139
d1d5300a 140 #
bfb43493 141 # libcups.so.2, libcups.sl.2
142diff -Nru cups-1.1.10/data/Makefile cups-1.1.10.new/data/Makefile
143--- cups-1.1.10/data/Makefile Thu Jul 19 22:17:52 2001
144+++ cups-1.1.10.new/data/Makefile Sun Sep 2 19:54:16 2001
145@@ -81,26 +81,20 @@
d1d5300a 146 #
147
148 install:
bfb43493 149- $(INSTALL_DIR) $(DATADIR)/banners
150+ $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/banners
151 for file in $(BANNERS); do \
152- $(INSTALL_DATA) $$file $(DATADIR)/banners; \
153+ $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/banners; \
154 done
155- $(INSTALL_DIR) $(DATADIR)/charsets
156+ $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/charsets
157 for file in $(CHARSETS); do \
158- $(INSTALL_DATA) $$file $(DATADIR)/charsets; \
159+ $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/charsets; \
160 done
161- $(INSTALL_DIR) $(DATADIR)/data
162+ $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/data
163 for file in $(DATAFILES); do \
164- $(INSTALL_DATA) $$file $(DATADIR)/data; \
165+ $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/data; \
166 done
167- -if test x$(PAMDIR) != x; then \
168- $(INSTALL_DIR) $(PAMDIR); \
169- if test -f /lib/security/pam_unix.so; then \
170- $(INSTALL_DATA) cups.suse $(PAMDIR)/cups; \
171- else \
172- $(INSTALL_DATA) cups.pam $(PAMDIR)/cups; \
173- fi \
174- fi
175+ $(INSTALL_DIR) $(DESTDIR)$(PAMDIR)
176+ $(INSTALL_DATA) cups.pam $(DESTDIR)$(PAMDIR)/cups
d1d5300a 177
178
179 #
bfb43493 180diff -Nru cups-1.1.10/doc/Makefile cups-1.1.10.new/doc/Makefile
181--- cups-1.1.10/doc/Makefile Thu Jul 19 22:17:53 2001
182+++ cups-1.1.10.new/doc/Makefile Sun Sep 2 19:55:11 2001
183@@ -118,21 +118,21 @@
d1d5300a 184 #
185
186 install:
bfb43493 187- $(INSTALL_DIR) $(DOCDIR)
188+ $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
189 for file in $(WEBPAGES); do \
190- $(INSTALL_MAN) $$file $(DOCDIR); \
191+ $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \
192 done
193- $(INSTALL_MAN) overview.html $(DOCDIR)
194- $(INSTALL_MAN) overview.pdf $(DOCDIR)
195+ $(INSTALL_MAN) overview.html $(DESTDIR)$(DOCDIR)
196+ $(INSTALL_MAN) overview.pdf $(DESTDIR)$(DOCDIR)
197 for file in $(DOCUMENTS:.shtml=.html); do \
198- $(INSTALL_MAN) $$file $(DOCDIR); \
199+ $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \
200 done
201 for file in $(DOCUMENTS:.shtml=.pdf); do \
202- $(INSTALL_MAN) $$file $(DOCDIR); \
203+ $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \
204 done
205- $(INSTALL_DIR) $(DOCDIR)/images
206+ $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/images
207 for file in $(WEBIMAGES) $(DOCIMAGES); do \
208- $(INSTALL_MAN) $$file $(DOCDIR)/images; \
209+ $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/images; \
210 done
d1d5300a 211
212
bfb43493 213diff -Nru cups-1.1.10/filter/Makefile cups-1.1.10.new/filter/Makefile
214--- cups-1.1.10/filter/Makefile Fri Aug 17 17:54:02 2001
215+++ cups-1.1.10.new/filter/Makefile Sun Sep 2 19:56:05 2001
216@@ -59,19 +59,15 @@
d1d5300a 217 #
218
219 install:
bfb43493 220- $(INSTALL_DIR) $(SERVERBIN)/filter
221+ $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/filter
222 for file in $(TARGETS); do \
223- $(INSTALL_BIN) $$file $(SERVERBIN)/filter; \
224+ $(INSTALL_BIN) $$file $(DESTDIR)$(SERVERBIN)/filter; \
225 done
d1d5300a 226- $(INSTALL_DIR) $(LIBDIR)
227- $(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR)
bfb43493 228- -if test $(LIBCUPSIMAGE) = "libcupsimage.so.2" -o $(LIBCUPSIMAGE) = "libcupsimage.sl.2"; then \
229- $(RM) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
230- $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
231- fi
d1d5300a 232- $(INSTALL_DIR) $(INCLUDEDIR)/cups
233- $(INSTALL_DATA) raster.h $(INCLUDEDIR)/cups
bfb43493 234-
235+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
236+ $(INSTALL_LIB) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)
237+ $(LN) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
d1d5300a 238+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/cups
239+ $(INSTALL_DATA) raster.h $(DESTDIR)$(INCLUDEDIR)/cups
240
d1d5300a 241 #
bfb43493 242 # formtops
243diff -Nru cups-1.1.10/fonts/Makefile cups-1.1.10.new/fonts/Makefile
244--- cups-1.1.10/fonts/Makefile Thu Jul 19 22:17:55 2001
245+++ cups-1.1.10.new/fonts/Makefile Sun Sep 2 20:04:21 2001
246@@ -64,9 +64,9 @@
d1d5300a 247 #
248
249 install:
bfb43493 250- $(INSTALL_DIR) $(DATADIR)/fonts
251+ $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/fonts
252 for file in $(FONTS); do \
253- $(INSTALL_DATA) $$file $(DATADIR)/fonts; \
254+ $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/fonts; \
255 done
d1d5300a 256
257
bfb43493 258diff -Nru cups-1.1.10/locale/Makefile cups-1.1.10.new/locale/Makefile
259--- cups-1.1.10/locale/Makefile Wed Jun 27 23:53:15 2001
260+++ cups-1.1.10.new/locale/Makefile Sun Sep 2 19:40:12 2001
d1d5300a 261@@ -50,10 +50,10 @@
262 #
263
264 install:
265- $(INSTALL_DIR) $(LOCALEDIR)
266+ $(INSTALL_DIR) $(DESTDIR)$(LOCALEDIR)
267 for dir in $(LOCALES) ; do \
268- $(INSTALL_DIR) $(LOCALEDIR)/$$dir ; \
269- $(INSTALL_DATA) $$dir/cups_$$dir $(LOCALEDIR)/$$dir ; \
270+ $(INSTALL_DIR) $(DESTDIR)$(LOCALEDIR)/$$dir ; \
271+ $(INSTALL_DATA) $$dir/cups_$$dir $(DESTDIR)$(LOCALEDIR)/$$dir ; \
272 done
273
274
bfb43493 275diff -Nru cups-1.1.10/man/Makefile cups-1.1.10.new/man/Makefile
276--- cups-1.1.10/man/Makefile Thu Jul 19 22:17:56 2001
277+++ cups-1.1.10.new/man/Makefile Sun Sep 2 19:58:37 2001
278@@ -60,43 +60,21 @@
d1d5300a 279 #
280
281 install:
bfb43493 282- $(INSTALL_DIR) $(MANDIR)/man1
283+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1
284 for file in $(MAN1); do \
285- $(INSTALL_MAN) $$file $(MANDIR)/man1/`basename $$file man`1; \
286+ $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/man1/`basename $$file man`1; \
287 done
288- $(RM) $(MANDIR)/man1/cancel.1
289- $(LN) lp.1 $(MANDIR)/man1/cancel.1
290- $(INSTALL_DIR) $(MANDIR)/man5
291+ echo ".so lp.1" > $(DESTDIR)$(MANDIR)/man1/cancel.1
292+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man5
293 for file in $(MAN5); do \
294- $(INSTALL_MAN) $$file $(MANDIR)/man5/`basename $$file man`5; \
295+ $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/man5/`basename $$file man`5; \
296 done
297- $(INSTALL_DIR) $(AMANDIR)/man$(MAN8EXT)
298+ $(INSTALL_DIR) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)
299 for file in $(MAN8); do \
300- $(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
301+ $(INSTALL_MAN) $$file $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
302 done
303- $(RM) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
304- $(LN) accept.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
305- $(RM) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
306- $(LN) enable.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
307- $(INSTALL_DIR) $(MANDIR)/cat1
308- for file in $(CAT1); do \
309- $(INSTALL_MAN) $$file $(MANDIR)/cat1; \
310- done
311- $(RM) $(MANDIR)/cat1/cancel.$(CAT1EXT)
312- $(LN) lp.$(CAT1EXT) $(MANDIR)/cat1/cancel.$(CAT1EXT)
313- $(INSTALL_DIR) $(MANDIR)/cat5
314- for file in $(CAT5); do \
315- $(INSTALL_MAN) $$file $(MANDIR)/cat5; \
316- done
317- $(INSTALL_DIR) $(AMANDIR)/cat$(MAN8EXT)
318- for file in $(CAT8); do \
319- $(INSTALL_MAN) $$file $(AMANDIR)/cat$(MAN8EXT); \
320- done
321- $(RM) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
322- $(LN) accept.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
323- $(RM) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
324- $(LN) enable.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
325-
326+ echo ".so accept.$(MAN8EXT)" > $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
327+ echo ".so enable.$(MAN8EXT)" > $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
d1d5300a 328
329 #
bfb43493 330 # End of "$Id$".
331diff -Nru cups-1.1.10/pdftops/Makefile cups-1.1.10.new/pdftops/Makefile
332--- cups-1.1.10/pdftops/Makefile Wed Jun 27 23:53:16 2001
333+++ cups-1.1.10.new/pdftops/Makefile Sun Sep 2 19:40:12 2001
d1d5300a 334@@ -43,8 +43,8 @@
335 #
336
337 install:
338- $(INSTALL_DIR) $(SERVERBIN)/filter
339- $(INSTALL_BIN) pdftops $(SERVERBIN)/filter
340+ $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/filter
341+ $(INSTALL_BIN) pdftops $(DESTDIR)$(SERVERBIN)/filter
342
343
344 #
bfb43493 345diff -Nru cups-1.1.10/ppd/Makefile cups-1.1.10.new/ppd/Makefile
346--- cups-1.1.10/ppd/Makefile Thu Jul 19 22:17:56 2001
347+++ cups-1.1.10.new/ppd/Makefile Sun Sep 2 19:58:58 2001
348@@ -52,9 +52,9 @@
d1d5300a 349 #
350
351 install:
bfb43493 352- $(INSTALL_DIR) $(DATADIR)/model
353+ $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/model
354 for file in $(FILES); do \
355- $(INSTALL_DATA) $$file $(DATADIR)/model; \
356+ $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/model; \
357 done
358
359
360diff -Nru cups-1.1.10/pstoraster/Makefile cups-1.1.10.new/pstoraster/Makefile
361--- cups-1.1.10/pstoraster/Makefile Thu Jul 19 22:17:57 2001
362+++ cups-1.1.10.new/pstoraster/Makefile Sun Sep 2 19:59:30 2001
363@@ -376,11 +376,11 @@
364 #
365
366 install: $(TARGETS)
367- $(INSTALL_DIR) $(SERVERBIN)/filter
368- $(INSTALL_BIN) pstoraster $(SERVERBIN)/filter
369- $(INSTALL_DIR) $(DATADIR)/pstoraster
370+ $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/filter
371+ $(INSTALL_BIN) pstoraster $(DESTDIR)$(SERVERBIN)/filter
372+ $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/pstoraster
373 for file in $(DFILES); do \
374- $(INSTALL_DATA) $$file $(DATADIR)/pstoraster; \
375+ $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/pstoraster; \
376 done
d1d5300a 377
378
bfb43493 379diff -Nru cups-1.1.10/scheduler/Makefile cups-1.1.10.new/scheduler/Makefile
380--- cups-1.1.10/scheduler/Makefile Mon Jul 23 20:48:52 2001
381+++ cups-1.1.10.new/scheduler/Makefile Sun Sep 2 20:00:44 2001
382@@ -52,17 +52,17 @@
d1d5300a 383 #
bfb43493 384
385 install:
386- $(INSTALL_DIR) $(SBINDIR)
387- $(INSTALL_BIN) cupsd $(SBINDIR)
388- $(INSTALL_DIR) $(SERVERBIN)/daemon
389- $(INSTALL_BIN) cups-lpd $(SERVERBIN)/daemon
390- $(INSTALL_BIN) cups-polld $(SERVERBIN)/daemon
391- $(INSTALL_DIR) -m 711 -o $(CUPS_USER) -g $(CUPS_GROUP) $(SERVERROOT)/certs
392- $(INSTALL_DIR) $(SERVERROOT)/interfaces
393- $(INSTALL_DIR) $(SERVERROOT)/ppd
394- $(INSTALL_DIR) $(LOGDIR)
395- $(INSTALL_DIR) -m 700 -o $(CUPS_USER) -g $(CUPS_GROUP) $(REQUESTS)
396- $(INSTALL_DIR) -m 1700 -o $(CUPS_USER) -g $(CUPS_GROUP) $(REQUESTS)/tmp
397+ $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
398+ $(INSTALL_BIN) cupsd $(DESTDIR)$(SBINDIR)
399+ $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/daemon
400+ $(INSTALL_BIN) cups-lpd $(DESTDIR)$(SERVERBIN)/daemon
401+ $(INSTALL_BIN) cups-polld $(DESTDIR)$(SERVERBIN)/daemon
402+ $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/certs
403+ $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/interfaces
404+ $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/ppd
405+ $(INSTALL_DIR) $(DESTDIR)$(LOGDIR)
406+ $(INSTALL_DIR) $(DESTDIR)$(REQUESTS)
407+ $(INSTALL_DIR) $(DESTDIR)$(REQUESTS)/tmp
408
409
410 #
411diff -Nru cups-1.1.10/systemv/Makefile cups-1.1.10.new/systemv/Makefile
412--- cups-1.1.10/systemv/Makefile Fri Aug 17 16:22:55 2001
413+++ cups-1.1.10.new/systemv/Makefile Sun Sep 2 20:01:49 2001
414@@ -50,22 +50,19 @@
415 #
416
417 install:
418- $(INSTALL_DIR) $(BINDIR)
419- $(INSTALL_BIN) accept $(SBINDIR)
420- $(RM) $(SBINDIR)/reject
421- $(LN) accept $(SBINDIR)/reject
422- $(INSTALL_BIN) lpadmin $(SBINDIR)
423- $(INSTALL_BIN) lpinfo $(SBINDIR)
424- $(INSTALL_BIN) lpmove $(SBINDIR)
425- $(INSTALL_BIN) cancel $(BINDIR)
426- $(RM) $(BINDIR)/disable
427- $(LN) ../sbin/accept $(BINDIR)/disable
428- $(RM) $(BINDIR)/enable
429- $(LN) ../sbin/accept $(BINDIR)/enable
430- $(INSTALL_BIN) lp $(BINDIR)
431- $(INSTALL_BIN) lpoptions $(BINDIR)
432- $(INSTALL_BIN) lpstat $(BINDIR)
433- $(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR)
434+ $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
435+ $(INSTALL_BIN) accept $(DESTDIR)$(SBINDIR)
436+ $(LN) -sf accept $(DESTDIR)$(SBINDIR)/reject
437+ $(INSTALL_BIN) lpadmin $(DESTDIR)$(SBINDIR)
438+ $(INSTALL_BIN) lpinfo $(DESTDIR)$(SBINDIR)
439+ $(INSTALL_BIN) lpmove $(DESTDIR)$(SBINDIR)
440+ $(INSTALL_BIN) cancel $(DESTDIR)$(BINDIR)
441+ $(LN) -sf ../sbin/accept $(DESTDIR)$(BINDIR)/disable
442+ $(LN) -sf ../sbin/accept $(DESTDIR)$(BINDIR)/enable
443+ $(INSTALL_BIN) lp $(DESTDIR)$(BINDIR)
444+ $(INSTALL_BIN) lpoptions $(DESTDIR)$(BINDIR)
445+ $(INSTALL_BIN) lpstat $(DESTDIR)$(BINDIR)
446+ $(INSTALL_BIN) lppasswd $(DESTDIR)$(BINDIR)
447
448
449 #
450diff -Nru cups-1.1.10/templates/Makefile cups-1.1.10.new/templates/Makefile
451--- cups-1.1.10/templates/Makefile Fri Aug 17 16:12:12 2001
452+++ cups-1.1.10.new/templates/Makefile Sun Sep 2 20:02:06 2001
453@@ -91,9 +91,9 @@
d1d5300a 454 #
455
456 install:
457- $(INSTALL_DIR) $(DATADIR)/templates
d1d5300a 458+ $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/templates
bfb43493 459 for file in $(FILES); do \
460- $(INSTALL_DATA) $$file $(DATADIR)/templates; \
461+ $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/templates; \
462 done
d1d5300a 463
464
USB backend for CUPS
This page took 0.103086 seconds and 4 git commands to generate.