/[gentoo-x86]/net-print/cups-filters/files/cups-filters-1.0.11-makefiles.patch
Gentoo

Contents of /net-print/cups-filters/files/cups-filters-1.0.11-makefiles.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Mon Sep 10 13:55:14 2012 UTC (2 years, 2 months ago) by scarabeus
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Version bump to latest. Drop unused patches.

(Portage version: 2.2.0_alpha125/cvs/Linux x86_64)

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

  ViewVC Help
Powered by ViewVC 1.1.20