1 |
scarabeus 12/04/03 16:02:59 |
2 |
|
3 |
Added: cups-filters-1.0.11-makefiles.patch |
4 |
Log: |
5 |
Initial commit of cups-filters that provide cups-pdf backend that is already in use by debian and ubuntu folks. |
6 |
|
7 |
(Portage version: 2.2.0_alpha98/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 net-print/cups-filters/files/cups-filters-1.0.11-makefiles.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups-filters/files/cups-filters-1.0.11-makefiles.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups-filters/files/cups-filters-1.0.11-makefiles.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: cups-filters-1.0.11-makefiles.patch |
16 |
=================================================================== |
17 |
diff -urN cups-filters-1.0.11.old/backend/Makefile cups-filters-1.0.11/backend/Makefile |
18 |
--- cups-filters-1.0.11.old/backend/Makefile 2012-04-03 17:40:50.326979137 +0200 |
19 |
+++ cups-filters-1.0.11/backend/Makefile 2012-04-03 17:43:59.027982425 +0200 |
20 |
@@ -74,9 +74,9 @@ |
21 |
|
22 |
install-exec: |
23 |
echo Installing backends in $(SERVERBIN)/backend... |
24 |
- $(INSTALL_DIR) -m 755 $(SERVERBIN)/backend |
25 |
+ $(INSTALL_DIR) -m 755 $(DESTDIR)/$(SERVERBIN)/backend |
26 |
for file in $(BACKENDS); do \ |
27 |
- $(INSTALL_BIN) $$file $(SERVERBIN)/backend; \ |
28 |
+ $(INSTALL_BIN) $$file $(DESTDIR)/$(SERVERBIN)/backend; \ |
29 |
done |
30 |
|
31 |
|
32 |
diff -urN cups-filters-1.0.11.old/config-scripts/cups-compiler.m4 cups-filters-1.0.11/config-scripts/cups-compiler.m4 |
33 |
--- cups-filters-1.0.11.old/config-scripts/cups-compiler.m4 2012-04-03 17:40:50.332979138 +0200 |
34 |
+++ cups-filters-1.0.11/config-scripts/cups-compiler.m4 2012-04-03 17:41:23.281979712 +0200 |
35 |
@@ -23,13 +23,6 @@ |
36 |
AC_ARG_WITH(optim, [ --with-optim set optimization flags ]) |
37 |
AC_ARG_ENABLE(debug, [ --enable-debug build with debugging symbols]) |
38 |
|
39 |
-dnl For debugging, keep symbols, otherwise strip them... |
40 |
-if test x$enable_debug = xyes; then |
41 |
- OPTIM="-g" |
42 |
-else |
43 |
- INSTALL_STRIP="-s" |
44 |
-fi |
45 |
- |
46 |
dnl Read-only data/program support on Linux... |
47 |
AC_ARG_ENABLE(relro, [ --enable-relro build with the GCC relro option]) |
48 |
|
49 |
diff -urN cups-filters-1.0.11.old/cupsfilters/Makefile cups-filters-1.0.11/cupsfilters/Makefile |
50 |
--- cups-filters-1.0.11.old/cupsfilters/Makefile 2012-04-03 17:40:50.330979139 +0200 |
51 |
+++ cups-filters-1.0.11/cupsfilters/Makefile 2012-04-03 17:57:26.362996484 +0200 |
52 |
@@ -120,9 +120,9 @@ |
53 |
|
54 |
install-headers: |
55 |
echo Installing header files into $(INCLUDEDIR)/cupsfilters... |
56 |
- $(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cupsfilters |
57 |
+ $(INSTALL_DIR) -m 755 $(DESTDIR)/$(INCLUDEDIR)/cupsfilters |
58 |
for file in $(HEADERS); do \ |
59 |
- $(INSTALL_DATA) $$file $(INCLUDEDIR)/cupsfilters; \ |
60 |
+ $(INSTALL_DATA) $$file $(DESTDIR)/$(INCLUDEDIR)/cupsfilters; \ |
61 |
done |
62 |
|
63 |
|
64 |
@@ -132,16 +132,16 @@ |
65 |
|
66 |
install-libs: |
67 |
echo Installing libraries in $(LIBDIR)... |
68 |
- $(INSTALL_DIR) -m 755 $(LIBDIR) |
69 |
- $(INSTALL_LIB) $(LIBCUPSFILTERS) $(LIBDIR) |
70 |
- $(INSTALL_DATA) libcupsfilters.a $(LIBDIR) |
71 |
+ $(INSTALL_DIR) -m 755 $(DESTDIR)/$(LIBDIR) |
72 |
+ $(INSTALL_LIB) $(LIBCUPSFILTERS) $(DESTDIR)/$(LIBDIR) |
73 |
+ $(INSTALL_DATA) libcupsfilters.a $(DESTDIR)/$(LIBDIR) |
74 |
if test $(LIBCUPSFILTERS) = "libcupsfilters.so.1" -o $(LIBCUPSFILTERS) = "libcupsfilters.sl.1"; then \ |
75 |
- $(RM) $(LIBDIR)/`basename $(LIBCUPSFILTERS) .1`; \ |
76 |
- $(LN) $(LIBCUPSFILTERS) $(LIBDIR)/`basename $(LIBCUPSFILTERS) .1`; \ |
77 |
+ $(RM) $(DESTDIR)/$(LIBDIR)/`basename $(LIBCUPSFILTERS) .1`; \ |
78 |
+ $(LN) $(LIBCUPSFILTERS) $(DESTDIR)/$(LIBDIR)/`basename $(LIBCUPSFILTERS) .1`; \ |
79 |
fi |
80 |
if test $(LIBCUPSFILTERS) = "libcupsfilters.1.dylib"; then \ |
81 |
- $(RM) $(LIBDIR)/libcups.dylib; \ |
82 |
- $(LN) $(LIBCUPSFILTERS) $(LIBDIR)/libcups.dylib; \ |
83 |
+ $(RM) $(DESTDIR)/$(LIBDIR)/libcups.dylib; \ |
84 |
+ $(LN) $(LIBCUPSFILTERS) $(DESTDIR)/$(LIBDIR)/libcups.dylib; \ |
85 |
fi |
86 |
|
87 |
|
88 |
@@ -171,7 +171,7 @@ |
89 |
|
90 |
libcupsfilters.so.1: $(LIBOBJS) |
91 |
echo Linking $@... |
92 |
- $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(DSOLIBS) $(LINKCUPS) -lm |
93 |
+ $(DSO) $(LDFLAGS) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(DSOLIBS) $(LINKCUPS) -lm |
94 |
$(RM) `basename $@ .1` |
95 |
$(LN) $@ `basename $@ .1` |
96 |
|
97 |
diff -urN cups-filters-1.0.11.old/filter/Makefile cups-filters-1.0.11/filter/Makefile |
98 |
--- cups-filters-1.0.11.old/filter/Makefile 2012-04-03 17:40:50.324979137 +0200 |
99 |
+++ cups-filters-1.0.11/filter/Makefile 2012-04-03 17:53:35.708992459 +0200 |
100 |
@@ -130,35 +130,35 @@ |
101 |
|
102 |
install-data: |
103 |
echo Installing charsets to $(DATADIR)/charsets... |
104 |
- $(INSTALL_DIR) -m 755 $(DATADIR)/charsets |
105 |
+ $(INSTALL_DIR) -m 755 $(DESTDIR)/$(DATADIR)/charsets |
106 |
for file in $(CHARSETS); do \ |
107 |
- $(INSTALL_DATA) $$file $(DATADIR)/charsets; \ |
108 |
+ $(INSTALL_DATA) $$file $(DESTDIR)/$(DATADIR)/charsets; \ |
109 |
done; \ |
110 |
- $(LN) pdf.utf-8.simple $(DATADIR)/charsets/pdf.utf-8 |
111 |
+ $(LN) pdf.utf-8.simple $(DESTDIR)/$(DATADIR)/charsets/pdf.utf-8 |
112 |
echo Installing data files to $(DATADIR)/data... |
113 |
- $(INSTALL_DIR) -m 755 $(DATADIR)/data |
114 |
+ $(INSTALL_DIR) -m 755 $(DESTDIR)/$(DATADIR)/data |
115 |
for file in $(DATAFILES); do \ |
116 |
- $(INSTALL_DATA) $$file $(DATADIR)/data; \ |
117 |
+ $(INSTALL_DATA) $$file $(DESTDIR)/$(DATADIR)/data; \ |
118 |
done |
119 |
echo Installing banners to $(DATADIR)/banners... |
120 |
- $(INSTALL_DIR) -m 755 $(DATADIR)/banners |
121 |
+ $(INSTALL_DIR) -m 755 $(DESTDIR)/$(DATADIR)/banners |
122 |
for file in $(BANNERS); do \ |
123 |
- $(INSTALL_DATA) $$file $(DATADIR)/banners; \ |
124 |
+ $(INSTALL_DATA) $$file $(DESTDIR)/$(DATADIR)/banners; \ |
125 |
done |
126 |
echo Installing MIME files to $(DATADIR)/mime... |
127 |
- $(INSTALL_DIR) -m 755 $(DATADIR)/mime |
128 |
+ $(INSTALL_DIR) -m 755 $(DESTDIR)/$(DATADIR)/mime |
129 |
for file in $(MIMEFILES); do \ |
130 |
- $(INSTALL_DATA) $$file $(DATADIR)/mime; \ |
131 |
+ $(INSTALL_DATA) $$file $(DESTDIR)/$(DATADIR)/mime; \ |
132 |
done |
133 |
echo Installing DRV files to $(DATADIR)/drv... |
134 |
- $(INSTALL_DIR) -m 755 $(DATADIR)/drv |
135 |
+ $(INSTALL_DIR) -m 755 $(DESTDIR)/$(DATADIR)/drv |
136 |
for file in $(DRVFILES); do \ |
137 |
- $(INSTALL_DATA) $$file $(DATADIR)/drv; \ |
138 |
+ $(INSTALL_DATA) $$file $(DESTDIR)/$(DATADIR)/drv; \ |
139 |
done |
140 |
- echo Installing PPD files to $(BUILDROOT)${datadir}/ppd/cupsfilters... |
141 |
- $(INSTALL_DIR) -m 755 $(BUILDROOT)${datadir}/ppd/cupsfilters |
142 |
+ echo Installing PPD files to $(DATADIR)/ppd/cupsfilters... |
143 |
+ $(INSTALL_DIR) -m 755 $(DESTDIR)$(DATADIR)/ppd/cupsfilters |
144 |
for file in $(PPDFILES); do \ |
145 |
- $(INSTALL_DATA) $$file $(BUILDROOT)${datadir}/ppd/cupsfilters; \ |
146 |
+ $(INSTALL_DATA) $$file $(DESTDIR)$(DATADIR)/ppd/cupsfilters; \ |
147 |
done |
148 |
|
149 |
|
150 |
@@ -168,12 +168,12 @@ |
151 |
|
152 |
install-exec: |
153 |
echo Installing filters to $(SERVERBIN)/filter... |
154 |
- $(INSTALL_DIR) -m 755 $(SERVERBIN)/filter |
155 |
+ $(INSTALL_DIR) -m 755 $(DESTDIR)/$(SERVERBIN)/filter |
156 |
for file in $(TARGETS); do \ |
157 |
- $(INSTALL_BIN) $$file $(SERVERBIN)/filter; \ |
158 |
+ $(INSTALL_BIN) $$file $(DESTDIR)/$(SERVERBIN)/filter; \ |
159 |
done |
160 |
for file in $(SCRIPTS); do \ |
161 |
- $(INSTALL_SCRIPT) $$file $(SERVERBIN)/filter; \ |
162 |
+ $(INSTALL_SCRIPT) $$file $(DESTDIR)/$(SERVERBIN)/filter; \ |
163 |
done |
164 |
|
165 |
|
166 |
diff -urN cups-filters-1.0.11.old/pdftoopvp/Makefile cups-filters-1.0.11/pdftoopvp/Makefile |
167 |
--- cups-filters-1.0.11.old/pdftoopvp/Makefile 2012-04-03 17:40:50.331979139 +0200 |
168 |
+++ cups-filters-1.0.11/pdftoopvp/Makefile 2012-04-03 17:54:47.771993722 +0200 |
169 |
@@ -60,13 +60,13 @@ |
170 |
|
171 |
install-data: all |
172 |
echo Installing configuration files to $(sysconfdir)/fonts/conf.d... |
173 |
- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(sysconfdir)/fonts/conf.d |
174 |
- $(INSTALL_DATA) -m 644 99pdftoopvp.conf $(BUILDROOT)$(sysconfdir)/fonts/conf.d |
175 |
+ $(INSTALL_DIR) -m 755 $(DESTDIR)$(sysconfdir)/fonts/conf.d |
176 |
+ $(INSTALL_DATA) -m 644 99pdftoopvp.conf $(DESTDIR)$(sysconfdir)/fonts/conf.d |
177 |
|
178 |
install-exec: all |
179 |
echo Installing filters to $(SERVERBIN)/filter... |
180 |
- $(INSTALL_DIR) -m 755 $(SERVERBIN)/filter |
181 |
- $(INSTALL_BIN) pdftoopvp $(SERVERBIN)/filter |
182 |
+ $(INSTALL_DIR) -m 755 $(DESTDIR)/$(SERVERBIN)/filter |
183 |
+ $(INSTALL_BIN) pdftoopvp $(DESTDIR)/$(SERVERBIN)/filter |
184 |
|
185 |
install-headers: |
186 |
|
187 |
diff -urN cups-filters-1.0.11.old/pdftopdf/Makefile cups-filters-1.0.11/pdftopdf/Makefile |
188 |
--- cups-filters-1.0.11.old/pdftopdf/Makefile 2012-04-03 17:40:50.328979140 +0200 |
189 |
+++ cups-filters-1.0.11/pdftopdf/Makefile 2012-04-03 17:44:39.759983134 +0200 |
190 |
@@ -78,8 +78,8 @@ |
191 |
|
192 |
install-exec: all |
193 |
echo Installing filters in $(SERVERBIN)/filter... |
194 |
- $(INSTALL_DIR) -m 755 $(SERVERBIN)/filter |
195 |
- $(INSTALL_BIN) pdftopdf $(SERVERBIN)/filter |
196 |
+ $(INSTALL_DIR) -m 755 $(DESTDIR)/$(SERVERBIN)/filter |
197 |
+ $(INSTALL_BIN) pdftopdf $(DESTDIR)/$(SERVERBIN)/filter |
198 |
|
199 |
install-headers: |