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