]>
Commit | Line | Data |
---|---|---|
e66bd3b2 | 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 | |
4 | @@ -87,32 +87,8 @@ | |
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; \ | |
22 | - fi | |
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; \ | |
30 | - else \ | |
31 | - $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \ | |
32 | - fi \ | |
33 | - fi | |
34 | + $(INSTALL_DIR) $(DESTDIR)$(BINDIR) | |
35 | + $(INSTALL_SCRIPT) cups-config $(DESTDIR)$(BINDIR)/cups-config | |
36 | ||
37 | # | |
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 | |
d5b299a2 | 42 | @@ -59,12 +59,12 @@ |
d1d5300a | 43 | # |
44 | ||
d5b299a2 | 45 | install: all |
bfb43493 | 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; \ | |
d1d5300a | 51 | done |
bfb43493 | 52 | - $(RM) $(SERVERBIN)/backend/http |
53 | - $(LN) ipp $(SERVERBIN)/backend/http | |
d5b299a2 AM |
54 | + $(RM) $(DESTDIR)$(SERVERBIN)/backend/http |
55 | + $(LN) ipp $(DESTDIR)$(SERVERBIN)/backend/http | |
d1d5300a | 56 | |
57 | ||
58 | # | |
e66bd3b2 | 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 | |
d5b299a2 | 62 | @@ -56,12 +56,12 @@ |
d1d5300a | 63 | # |
64 | ||
d5b299a2 | 65 | install: all |
bfb43493 | 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) | |
d1d5300a | 78 | |
79 | ||
80 | # | |
e66bd3b2 | 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 | |
d5b299a2 | 84 | @@ -58,9 +58,9 @@ |
d1d5300a | 85 | # |
86 | ||
d5b299a2 | 87 | install: all |
bfb43493 | 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; \ | |
93 | done | |
d1d5300a | 94 | |
bfb43493 | 95 | |
e66bd3b2 | 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 | |
d5b299a2 | 99 | @@ -51,23 +51,23 @@ |
d1d5300a | 100 | # |
101 | ||
102 | install: | |
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 ; \ | |
d5b299a2 AM |
108 | + if test -r $(DESTDIR)$(SERVERROOT)/$$file ; then \ |
109 | + $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT)/$$file.N ; \ | |
110 | else \ | |
d1d5300a | 111 | - $(INSTALL_DATA) $$file $(SERVERROOT) ; \ |
d5b299a2 AM |
112 | + $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT) ; \ |
113 | fi ; \ | |
d1d5300a | 114 | done |
115 | for file in $(REPLACE); do \ | |
116 | - if test -r $(SERVERROOT)/$$file ; then \ | |
117 | - $(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \ | |
d5b299a2 AM |
118 | + if test -r $(DESTDIR)$(SERVERROOT)/$$file ; then \ |
119 | + $(MV) $(DESTDIR)$(SERVERROOT)/$$file $(DESTDIR)$(SERVERROOT)/$$file.O ; \ | |
120 | fi ; \ | |
d1d5300a | 121 | - $(INSTALL_DATA) $$file $(SERVERROOT) ; \ |
122 | + $(INSTALL_DATA) $$file $(DESTDIR)$(SERVERROOT) ; \ | |
123 | done | |
d5b299a2 AM |
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; \ | |
129 | fi | |
d1d5300a | 130 | |
131 | ||
e66bd3b2 | 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 | |
135 | @@ -80,26 +80,26 @@ | |
d1d5300a | 136 | # |
137 | ||
d5b299a2 | 138 | install: all installhdrs |
d1d5300a | 139 | - $(INSTALL_DIR) $(LIBDIR) |
140 | - $(INSTALL_LIB) $(LIBCUPS) $(LIBDIR) | |
d5b299a2 AM |
141 | + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) |
142 | + $(INSTALL_LIB) $(LIBCUPS) $(DESTDIR)$(LIBDIR) | |
143 | if test $(LIBCUPS) = "libcups.so.2" -o $(LIBCUPS) = "libcups.sl.2"; then \ | |
bfb43493 | 144 | - $(RM) $(LIBDIR)/`basename $(LIBCUPS) .2`; \ |
145 | - $(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \ | |
d5b299a2 AM |
146 | + $(RM) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPS) .2`; \ |
147 | + $(LN) $(LIBCUPS) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPS) .2`; \ | |
148 | fi | |
149 | if test $(LIBCUPS) = "libcups.2.dylib"; then \ | |
150 | - $(STRIP) -x $(LIBDIR)/$(LIBCUPS); \ | |
fb198dce | 151 | - $(RM) $(LIBDIR)/libcups.dylib; \ |
152 | - $(LN) $(LIBCUPS) $(LIBDIR)/libcups.dylib; \ | |
d5b299a2 AM |
153 | + $(STRIP) -x $(DESTDIR)$(LIBDIR)/$(LIBCUPS); \ |
154 | + $(RM) $(DESTDIR)$(LIBDIR)/libcups.dylib; \ | |
155 | + $(LN) $(LIBCUPS) $(DESTDIR)$(LIBDIR)/libcups.dylib; \ | |
156 | fi | |
157 | if test $(LIBCUPS) != "libcups.a"; then \ | |
bfb43493 | 158 | - $(INSTALL_LIB) libcups.a $(LIBDIR); \ |
d5b299a2 AM |
159 | + $(INSTALL_LIB) libcups.a $(DESTDIR)$(LIBDIR); \ |
160 | fi | |
161 | - $(RANLIB) $(LIBDIR)/libcups.a | |
162 | + $(RANLIB) $(DESTDIR)$(LIBDIR)/libcups.a | |
163 | ||
164 | installhdrs: | |
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; \ | |
170 | done | |
d1d5300a | 171 | |
fb198dce | 172 | |
e66bd3b2 | 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 | |
176 | @@ -84,17 +84,17 @@ | |
d1d5300a | 177 | # |
178 | ||
179 | install: | |
bfb43493 | 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; \ | |
185 | done | |
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; \ | |
191 | done | |
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; \ | |
197 | done | |
d1d5300a | 198 | |
d5b299a2 | 199 | |
e66bd3b2 | 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 | |
71bac56b AF |
203 | @@ -123,21 +123,21 @@ |
204 | # | |
205 | ||
206 | install: | |
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); \ | |
212 | done | |
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); \ | |
220 | done | |
221 | for file in $(DOCUMENTS:.shtml=.pdf); do \ | |
222 | - $(INSTALL_MAN) $$file $(DOCDIR); \ | |
223 | + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR); \ | |
224 | done | |
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; \ | |
230 | done | |
e66bd3b2 | 231 | cd de; $(MAKE) $(MFLAGS) install |
71bac56b | 232 | cd fr; $(MAKE) $(MFLAGS) install |
e66bd3b2 | 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 | |
236 | @@ -75,13 +75,13 @@ | |
237 | # | |
238 | ||
239 | install: | |
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; \ | |
245 | done | |
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; \ | |
251 | done | |
71bac56b | 252 | |
e66bd3b2 | 253 | |
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 @@ | |
258 | # | |
259 | ||
260 | install: | |
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; \ | |
266 | done | |
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; \ | |
274 | done | |
275 | for file in $(DOCUMENTS:.shtml=.pdf); do \ | |
276 | - $(INSTALL_MAN) $$file $(DOCDIR)/fr; \ | |
277 | + $(INSTALL_MAN) $$file $(DESTDIR)$(DOCDIR)/fr; \ | |
278 | done | |
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; \ | |
284 | done | |
285 | ||
286 | ||
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 | |
d5b299a2 AM |
290 | @@ -70,30 +70,30 @@ |
291 | # | |
292 | ||
293 | install: all installhdrs | |
bfb43493 | 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; \ | |
299 | done | |
d1d5300a | 300 | - $(INSTALL_DIR) $(LIBDIR) |
301 | - $(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR) | |
d5b299a2 AM |
302 | + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) |
303 | + $(INSTALL_LIB) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR) | |
304 | -if test $(LIBCUPSIMAGE) = "libcupsimage.so.2" -o $(LIBCUPSIMAGE) = "libcupsimage.sl.2"; then \ | |
bfb43493 | 305 | - $(RM) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \ |
306 | - $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \ | |
d5b299a2 AM |
307 | + $(RM) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \ |
308 | + $(LN) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \ | |
309 | fi | |
310 | -if test $(LIBCUPSIMAGE) = "libcupsimage.2.dylib"; then \ | |
311 | - $(STRIP) -x $(LIBDIR)/$(LIBCUPSIMAGE); \ | |
fb198dce | 312 | - $(RM) $(LIBDIR)/libcupsimage.dylib; \ |
313 | - $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/libcupsimage.dylib; \ | |
d5b299a2 AM |
314 | + $(STRIP) -x $(DESTDIR)$(LIBDIR)/$(LIBCUPSIMAGE); \ |
315 | + $(RM) $(DESTDIR)$(LIBDIR)/libcupsimage.dylib; \ | |
316 | + $(LN) $(LIBCUPSIMAGE) $(DESTDIR)$(LIBDIR)/libcupsimage.dylib; \ | |
317 | fi | |
318 | -if test $(LIBCUPSIMAGE) != "libcupsimage.a"; then \ | |
319 | - $(INSTALL_LIB) libcupsimage.a $(LIBDIR); \ | |
320 | + $(INSTALL_LIB) libcupsimage.a $(DESTDIR)$(LIBDIR); \ | |
321 | fi | |
322 | - $(RANLIB) $(LIBDIR)/libcupsimage.a | |
323 | + $(RANLIB) $(DESTDIR)$(LIBDIR)/libcupsimage.a | |
324 | ||
325 | installhdrs: | |
d1d5300a | 326 | - $(INSTALL_DIR) $(INCLUDEDIR)/cups |
23db0460 | 327 | - $(INSTALL_DATA) image.h $(INCLUDEDIR)/cups |
d1d5300a | 328 | - $(INSTALL_DATA) raster.h $(INCLUDEDIR)/cups |
d1d5300a | 329 | + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/cups |
d5b299a2 AM |
330 | + $(INSTALL_DATA) image.h $(DESTDIR)$(INCLUDEDIR)/cups |
331 | + $(INSTALL_DATA) raster.h $(DESTDIR)$(INCLUDEDIR)/cups | |
332 | ||
fb198dce | 333 | |
d1d5300a | 334 | # |
e66bd3b2 | 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 | |
d5b299a2 | 338 | @@ -51,9 +51,9 @@ |
d1d5300a | 339 | # |
340 | ||
341 | install: | |
bfb43493 | 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; \ | |
347 | done | |
d1d5300a | 348 | |
349 | ||
e66bd3b2 | 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 | |
353 | @@ -50,10 +50,10 @@ | |
d1d5300a | 354 | # |
355 | ||
356 | install: | |
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 ; \ | |
364 | done | |
365 | ||
366 | ||
e66bd3b2 | 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 | |
71bac56b AF |
370 | @@ -68,50 +68,50 @@ |
371 | # | |
372 | ||
373 | install: all | |
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; \ | |
379 | done | |
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; \ | |
389 | done | |
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; \ | |
395 | done | |
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); \ | |
401 | done | |
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; \ | |
415 | done | |
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; \ | |
425 | done | |
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; \ | |
431 | done | |
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); \ | |
437 | done | |
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); \ | |
e66bd3b2 | 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 | |
452 | @@ -60,50 +60,50 @@ | |
453 | # | |
454 | ||
455 | install: all | |
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; \ | |
461 | done | |
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; \ | |
471 | done | |
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; \ | |
477 | done | |
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); \ | |
483 | done | |
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; \ | |
497 | done | |
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; \ | |
507 | done | |
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; \ | |
513 | done | |
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); \ | |
519 | done | |
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) | |
528 | ||
529 | ||
530 | # | |
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 | |
2826d567 | 534 | @@ -91,8 +91,8 @@ |
d1d5300a | 535 | # |
536 | ||
d5b299a2 | 537 | install: all |
d1d5300a | 538 | - $(INSTALL_DIR) $(SERVERBIN)/filter |
539 | - $(INSTALL_BIN) pdftops $(SERVERBIN)/filter | |
540 | + $(INSTALL_DIR) $(DESTDIR)$(SERVERBIN)/filter | |
541 | + $(INSTALL_BIN) pdftops $(DESTDIR)$(SERVERBIN)/filter | |
542 | ||
543 | ||
544 | # | |
e66bd3b2 | 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 | |
bfb43493 | 548 | @@ -52,9 +52,9 @@ |
d1d5300a | 549 | # |
550 | ||
551 | install: | |
bfb43493 | 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; \ | |
557 | done | |
558 | ||
559 | ||
e66bd3b2 | 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 | |
563 | @@ -61,17 +61,17 @@ | |
d1d5300a | 564 | # |
bfb43493 | 565 | |
d5b299a2 | 566 | install: all |
bfb43493 | 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 | |
d5b299a2 | 572 | - $(INSTALL_DIR) -m 711 $(SERVERROOT)/certs |
bfb43493 | 573 | - $(INSTALL_DIR) $(SERVERROOT)/interfaces |
574 | - $(INSTALL_DIR) $(SERVERROOT)/ppd | |
575 | - $(INSTALL_DIR) $(LOGDIR) | |
e66bd3b2 | 576 | - $(INSTALL_DIR) -m 710 $(REQUESTS) |
577 | - $(INSTALL_DIR) -m 1770 $(REQUESTS)/tmp | |
bfb43493 | 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 | |
d5b299a2 | 583 | + $(INSTALL_DIR) -m 711 $(DESTDIR)$(SERVERROOT)/certs |
bfb43493 | 584 | + $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/interfaces |
585 | + $(INSTALL_DIR) $(DESTDIR)$(SERVERROOT)/ppd | |
586 | + $(INSTALL_DIR) $(DESTDIR)$(LOGDIR) | |
e66bd3b2 | 587 | + $(INSTALL_DIR) -m 710 $(DESTDIR)$(REQUESTS) |
588 | + $(INSTALL_DIR) -m 1770 $(DESTDIR)$(REQUESTS)/tmp | |
bfb43493 | 589 | |
590 | ||
591 | # | |
e66bd3b2 | 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 | |
2826d567 | 595 | @@ -59,26 +59,26 @@ |
bfb43493 | 596 | # |
597 | ||
d5b299a2 AM |
598 | install: all |
599 | - $(INSTALL_DIR) $(SBINDIR) | |
bfb43493 | 600 | - $(INSTALL_BIN) accept $(SBINDIR) |
601 | - $(RM) $(SBINDIR)/reject | |
602 | - $(LN) accept $(SBINDIR)/reject | |
fb198dce | 603 | - $(INSTALL_BIN) cupsaddsmb $(SBINDIR) |
bfb43493 | 604 | - $(INSTALL_BIN) lpadmin $(SBINDIR) |
605 | - $(INSTALL_BIN) lpinfo $(SBINDIR) | |
606 | - $(INSTALL_BIN) lpmove $(SBINDIR) | |
d5b299a2 | 607 | - $(INSTALL_DIR) $(BINDIR) |
bfb43493 | 608 | - $(INSTALL_BIN) cancel $(BINDIR) |
e66bd3b2 | 609 | - $(INSTALL_BIN) cupstestppd $(BINDIR) |
bfb43493 | 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) | |
d5b299a2 AM |
617 | - $(INSTALL_BIN) lppasswd $(BINDIR) |
618 | - -$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR) | |
619 | + $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) | |
bfb43493 | 620 | + $(INSTALL_BIN) accept $(DESTDIR)$(SBINDIR) |
d5b299a2 AM |
621 | + $(RM) $(DESTDIR)$(SBINDIR)/reject |
622 | + $(LN) accept $(DESTDIR)$(SBINDIR)/reject | |
fb198dce | 623 | + $(INSTALL_BIN) cupsaddsmb $(DESTDIR)$(SBINDIR) |
bfb43493 | 624 | + $(INSTALL_BIN) lpadmin $(DESTDIR)$(SBINDIR) |
625 | + $(INSTALL_BIN) lpinfo $(DESTDIR)$(SBINDIR) | |
626 | + $(INSTALL_BIN) lpmove $(DESTDIR)$(SBINDIR) | |
d5b299a2 | 627 | + $(INSTALL_DIR) $(DESTDIR)$(BINDIR) |
bfb43493 | 628 | + $(INSTALL_BIN) cancel $(DESTDIR)$(BINDIR) |
e66bd3b2 | 629 | + $(INSTALL_BIN) cupstestppd $(DESTDIR)$(BINDIR) |
d5b299a2 AM |
630 | + $(RM) $(DESTDIR)$(BINDIR)/disable |
631 | + $(LN) ../sbin/accept $(DESTDIR)$(BINDIR)/disable | |
632 | + $(RM) $(DESTDIR)$(BINDIR)/enable | |
633 | + $(LN) ../sbin/accept $(DESTDIR)$(BINDIR)/enable | |
bfb43493 | 634 | + $(INSTALL_BIN) lp $(DESTDIR)$(BINDIR) |
635 | + $(INSTALL_BIN) lpoptions $(DESTDIR)$(BINDIR) | |
636 | + $(INSTALL_BIN) lpstat $(DESTDIR)$(BINDIR) | |
637 | + $(INSTALL_BIN) lppasswd $(DESTDIR)$(BINDIR) | |
d5b299a2 | 638 | + -$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(DESTDIR)$(BINDIR) |
bfb43493 | 639 | |
640 | ||
641 | # | |
e66bd3b2 | 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 | |
645 | @@ -95,9 +95,9 @@ | |
646 | # | |
647 | ||
648 | install: | |
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; \ | |
654 | done | |
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 | |
71bac56b | 660 | @@ -94,9 +94,9 @@ |
d1d5300a | 661 | # |
662 | ||
663 | install: | |
e66bd3b2 | 664 | - $(INSTALL_DIR) $(DATADIR)/templates/de |
665 | + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/templates/de | |
bfb43493 | 666 | for file in $(FILES); do \ |
e66bd3b2 | 667 | - $(INSTALL_DATA) $$file $(DATADIR)/templates/de; \ |
668 | + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/templates/de; \ | |
bfb43493 | 669 | done |
d5b299a2 | 670 | |
71bac56b | 671 | |
e66bd3b2 | 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 | |
675 | @@ -94,9 +94,9 @@ | |
d5b299a2 AM |
676 | # |
677 | ||
678 | install: | |
e66bd3b2 | 679 | - $(INSTALL_DIR) $(DATADIR)/templates/fr |
680 | + $(INSTALL_DIR) $(DESTDIR)$(DATADIR)/templates/fr | |
d5b299a2 | 681 | for file in $(FILES); do \ |
e66bd3b2 | 682 | - $(INSTALL_DATA) $$file $(DATADIR)/templates/fr; \ |
683 | + $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/templates/fr; \ | |
d5b299a2 | 684 | done |
d1d5300a | 685 | |
686 |