]>
Commit | Line | Data |
---|---|---|
393045f6 JB |
1 | diff -Nur scribus-0.8.orig/scribus/libabout/Makefile.am scribus-0.8/scribus/libabout/Makefile.am |
2 | --- scribus-0.8.orig/scribus/libabout/Makefile.am Sat Sep 28 09:34:39 2002 | |
3 | +++ scribus-0.8/scribus/libabout/Makefile.am Thu Oct 24 12:47:03 2002 | |
4 | @@ -1,4 +1,4 @@ | |
5 | -libdir = $(prefix)/share/scribus/libs | |
6 | +libdir = $(prefix)/lib/scribus | |
7 | ####### kdevelop will overwrite this part!!! (begin)########## | |
8 | lib_LTLIBRARIES = libabout.la | |
9 | ||
10 | @@ -9,7 +9,7 @@ | |
11 | LDFLAGS = -s -export-dynamic | |
12 | ||
13 | ||
14 | -libabout_la_LDFLAGS = -version-info 0:0:0 | |
15 | +libabout_la_LDFLAGS = -avoid-version | |
16 | ||
17 | libabout_la_METASOURCES = AUTO | |
18 | ||
19 | diff -Nur scribus-0.8.orig/scribus/libabout/Makefile.in scribus-0.8/scribus/libabout/Makefile.in | |
20 | --- scribus-0.8.orig/scribus/libabout/Makefile.in Sat Sep 28 12:30:30 2002 | |
21 | +++ scribus-0.8/scribus/libabout/Makefile.in Thu Oct 24 12:47:22 2002 | |
22 | @@ -225,7 +225,7 @@ | |
23 | x_includes = @x_includes@ | |
24 | x_libraries = @x_libraries@ | |
25 | ||
26 | -libdir = $(prefix)/share/scribus/libs | |
27 | +libdir = $(prefix)/lib/scribus | |
28 | ####### kdevelop will overwrite this part!!! (begin)########## | |
29 | lib_LTLIBRARIES = libabout.la | |
30 | ||
31 | @@ -233,7 +233,7 @@ | |
32 | ||
33 | LDFLAGS = -s -export-dynamic | |
34 | ||
35 | -libabout_la_LDFLAGS = -version-info 0:0:0 | |
36 | +libabout_la_LDFLAGS = -avoid-version | |
37 | ||
38 | #>- libabout_la_METASOURCES = AUTO | |
39 | ||
40 | diff -Nur scribus-0.8.orig/scribus/libpdf/Makefile.am scribus-0.8/scribus/libpdf/Makefile.am | |
41 | --- scribus-0.8.orig/scribus/libpdf/Makefile.am Sat Sep 28 09:34:39 2002 | |
42 | +++ scribus-0.8/scribus/libpdf/Makefile.am Thu Oct 24 12:43:24 2002 | |
43 | @@ -1,4 +1,4 @@ | |
44 | -libdir = $(prefix)/share/scribus/libs | |
45 | +libdir = $(prefix)/lib/scribus | |
46 | CPPFLAGS = -I$(top_builddir)/scribus | |
47 | ####### kdevelop will overwrite this part!!! (begin)########## | |
48 | lib_LTLIBRARIES = libpdf.la | |
49 | @@ -10,7 +10,7 @@ | |
50 | LDFLAGS = -s -export-dynamic | |
51 | ||
52 | ||
53 | -libpdf_la_LDFLAGS = -version-info 0:0:0 | |
54 | +libpdf_la_LDFLAGS = -avoid-version | |
55 | ||
56 | libpdf_la_METASOURCES = AUTO | |
57 | ||
58 | diff -Nur scribus-0.8.orig/scribus/libpdf/Makefile.in scribus-0.8/scribus/libpdf/Makefile.in | |
59 | --- scribus-0.8.orig/scribus/libpdf/Makefile.in Sat Sep 28 12:30:31 2002 | |
60 | +++ scribus-0.8/scribus/libpdf/Makefile.in Thu Oct 24 12:43:49 2002 | |
61 | @@ -225,7 +225,7 @@ | |
62 | x_includes = @x_includes@ | |
63 | x_libraries = @x_libraries@ | |
64 | ||
65 | -libdir = $(prefix)/share/scribus/libs | |
66 | +libdir = $(prefix)/lib/scribus | |
67 | CPPFLAGS = -I$(top_builddir)/scribus | |
68 | ####### kdevelop will overwrite this part!!! (begin)########## | |
69 | lib_LTLIBRARIES = libpdf.la | |
70 | @@ -234,7 +234,7 @@ | |
71 | ||
72 | LDFLAGS = -s -export-dynamic | |
73 | ||
74 | -libpdf_la_LDFLAGS = -version-info 0:0:0 | |
75 | +libpdf_la_LDFLAGS = -avoid-version | |
76 | ||
77 | #>- libpdf_la_METASOURCES = AUTO | |
78 | ||
79 | diff -Nur scribus-0.8.orig/scribus/libpostscript/Makefile.am scribus-0.8/scribus/libpostscript/Makefile.am | |
80 | --- scribus-0.8.orig/scribus/libpostscript/Makefile.am Sat Sep 28 09:34:39 2002 | |
81 | +++ scribus-0.8/scribus/libpostscript/Makefile.am Thu Oct 24 12:44:08 2002 | |
82 | @@ -1,4 +1,4 @@ | |
83 | -libdir = $(prefix)/share/scribus/libs | |
84 | +libdir = $(prefix)/lib/scribus | |
85 | CPPFLAGS = -I$(top_builddir)/scribus | |
86 | ####### kdevelop will overwrite this part!!! (begin)########## | |
87 | lib_LTLIBRARIES = libpostscript.la | |
88 | @@ -10,7 +10,7 @@ | |
89 | LDFLAGS = -s -export-dynamic | |
90 | ||
91 | ||
92 | -libpostscript_la_LDFLAGS = -version-info 0:0:0 | |
93 | +libpostscript_la_LDFLAGS = -avoid-version | |
94 | ||
95 | libpostscript_la_METASOURCES = AUTO | |
96 | ||
97 | diff -Nur scribus-0.8.orig/scribus/libpostscript/Makefile.in scribus-0.8/scribus/libpostscript/Makefile.in | |
98 | --- scribus-0.8.orig/scribus/libpostscript/Makefile.in Sat Sep 28 12:30:31 2002 | |
99 | +++ scribus-0.8/scribus/libpostscript/Makefile.in Thu Oct 24 12:44:26 2002 | |
100 | @@ -225,7 +225,7 @@ | |
101 | x_includes = @x_includes@ | |
102 | x_libraries = @x_libraries@ | |
103 | ||
104 | -libdir = $(prefix)/share/scribus/libs | |
105 | +libdir = $(prefix)/lib/scribus | |
106 | CPPFLAGS = -I$(top_builddir)/scribus | |
107 | ####### kdevelop will overwrite this part!!! (begin)########## | |
108 | lib_LTLIBRARIES = libpostscript.la | |
109 | @@ -234,7 +234,7 @@ | |
110 | ||
111 | LDFLAGS = -s -export-dynamic | |
112 | ||
113 | -libpostscript_la_LDFLAGS = -version-info 0:0:0 | |
114 | +libpostscript_la_LDFLAGS = -avoid-version | |
115 | ||
116 | #>- libpostscript_la_METASOURCES = AUTO | |
117 | ||
118 | diff -Nur scribus-0.8.orig/scribus/libprefs/Makefile.am scribus-0.8/scribus/libprefs/Makefile.am | |
119 | --- scribus-0.8.orig/scribus/libprefs/Makefile.am Sat Sep 28 09:34:39 2002 | |
120 | +++ scribus-0.8/scribus/libprefs/Makefile.am Thu Oct 24 12:45:54 2002 | |
121 | @@ -1,4 +1,4 @@ | |
122 | -libdir = $(prefix)/share/scribus/libs | |
123 | +libdir = $(prefix)/lib/scribus | |
124 | CPPFLAGS = -I$(top_builddir)/scribus | |
125 | ####### kdevelop will overwrite this part!!! (begin)########## | |
126 | lib_LTLIBRARIES = libpreferences.la | |
127 | @@ -10,7 +10,7 @@ | |
128 | LDFLAGS = -s -export-dynamic | |
129 | ||
130 | ||
131 | -libpreferences_la_LDFLAGS = -version-info 0:0:0 | |
132 | +libpreferences_la_LDFLAGS = -avoid-version | |
133 | ||
134 | libpreferences_la_METASOURCES = AUTO | |
135 | ||
136 | diff -Nur scribus-0.8.orig/scribus/libprefs/Makefile.in scribus-0.8/scribus/libprefs/Makefile.in | |
137 | --- scribus-0.8.orig/scribus/libprefs/Makefile.in Sat Sep 28 12:30:31 2002 | |
138 | +++ scribus-0.8/scribus/libprefs/Makefile.in Thu Oct 24 12:46:16 2002 | |
139 | @@ -225,7 +225,7 @@ | |
140 | x_includes = @x_includes@ | |
141 | x_libraries = @x_libraries@ | |
142 | ||
143 | -libdir = $(prefix)/share/scribus/libs | |
144 | +libdir = $(prefix)/lib/scribus | |
145 | CPPFLAGS = -I$(top_builddir)/scribus | |
146 | ####### kdevelop will overwrite this part!!! (begin)########## | |
147 | lib_LTLIBRARIES = libpreferences.la | |
148 | @@ -234,7 +234,7 @@ | |
149 | ||
150 | LDFLAGS = -s -export-dynamic | |
151 | ||
152 | -libpreferences_la_LDFLAGS = -version-info 0:0:0 | |
153 | +libpreferences_la_LDFLAGS = -avoid-version | |
154 | ||
155 | #>- libpreferences_la_METASOURCES = AUTO | |
156 | ||
157 | diff -Nur scribus-0.8.orig/scribus/plugins/libchar/Makefile.am scribus-0.8/scribus/plugins/libchar/Makefile.am | |
158 | --- scribus-0.8.orig/scribus/plugins/libchar/Makefile.am Sat Sep 28 09:34:39 2002 | |
159 | +++ scribus-0.8/scribus/plugins/libchar/Makefile.am Thu Oct 24 12:44:57 2002 | |
160 | @@ -1,4 +1,4 @@ | |
161 | -libdir = $(prefix)/share/scribus/plugins | |
162 | +libdir = $(prefix)/lib/scribus/plugins | |
163 | CPPFLAGS = -I$(top_builddir)/scribus | |
164 | ####### kdevelop will overwrite this part!!! (begin)########## | |
165 | lib_LTLIBRARIES = libcharselect.la | |
166 | @@ -10,7 +10,7 @@ | |
167 | LDFLAGS = -s -export-dynamic | |
168 | ||
169 | ||
170 | -libcharselect_la_LDFLAGS = -version-info 0:0:0 | |
171 | +libcharselect_la_LDFLAGS = -avoid-version | |
172 | ||
173 | libcharselect_la_METASOURCES = AUTO | |
174 | ||
175 | diff -Nur scribus-0.8.orig/scribus/plugins/libchar/Makefile.in scribus-0.8/scribus/plugins/libchar/Makefile.in | |
176 | --- scribus-0.8.orig/scribus/plugins/libchar/Makefile.in Sat Sep 28 12:30:31 2002 | |
177 | +++ scribus-0.8/scribus/plugins/libchar/Makefile.in Thu Oct 24 12:45:38 2002 | |
178 | @@ -225,7 +225,7 @@ | |
179 | x_includes = @x_includes@ | |
180 | x_libraries = @x_libraries@ | |
181 | ||
182 | -libdir = $(prefix)/share/scribus/plugins | |
183 | +libdir = $(prefix)/lib/scribus/plugins | |
184 | CPPFLAGS = -I$(top_builddir)/scribus | |
185 | ####### kdevelop will overwrite this part!!! (begin)########## | |
186 | lib_LTLIBRARIES = libcharselect.la | |
187 | @@ -234,7 +234,7 @@ | |
188 | ||
189 | LDFLAGS = -s -export-dynamic | |
190 | ||
191 | -libcharselect_la_LDFLAGS = -version-info 0:0:0 | |
192 | +libcharselect_la_LDFLAGS = -avoid-version | |
193 | ||
194 | #>- libcharselect_la_METASOURCES = AUTO | |
195 | ||
196 | diff -Nur scribus-0.8.orig/scribus/scribus.cpp scribus-0.8/scribus/scribus.cpp | |
197 | --- scribus-0.8.orig/scribus/scribus.cpp Tue Sep 24 22:09:45 2002 | |
198 | +++ scribus-0.8/scribus/scribus.cpp Thu Oct 24 12:42:26 2002 | |
199 | @@ -2361,7 +2361,7 @@ | |
200 | typedef About* (*sdem)(QWidget *d); | |
201 | sdem demo; | |
202 | QString pfad = PREL; | |
203 | - pfad += "/share/scribus/libs/libabout.so"; | |
204 | + pfad += "/lib/scribus/libabout.so"; | |
205 | mo = dlopen(pfad, RTLD_LAZY); | |
206 | if (!mo) | |
207 | { | |
208 | @@ -3840,7 +3840,7 @@ | |
209 | typedef Preferences* (*sdem)(QWidget *d, preV *Vor); | |
210 | sdem demo; | |
211 | QString pfad = PREL; | |
212 | - pfad += "/share/scribus/libs/libpreferences.so"; | |
213 | + pfad += "/lib/scribus/libpreferences.so"; | |
214 | mo = dlopen(pfad, RTLD_LAZY); | |
215 | if (!mo) | |
216 | { | |
217 | @@ -4250,7 +4250,7 @@ | |
218 | typedef PSLib* (*sdem)(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf); | |
219 | sdem demo; | |
220 | QString pfad = PREL; | |
221 | - pfad += "/share/scribus/libs/libpostscript.so"; | |
222 | + pfad += "/lib/scribus/libpostscript.so"; | |
223 | PSDriver = dlopen(pfad, RTLD_LAZY); | |
224 | if (!PSDriver) | |
225 | { | |
226 | @@ -4280,7 +4280,7 @@ | |
227 | typedef PDFlib* (*sdem)(); | |
228 | sdem demo; | |
229 | QString pfad = PREL; | |
230 | - pfad += "/share/scribus/libs/libpdf.so"; | |
231 | + pfad += "/lib/scribus/libpdf.so"; | |
232 | PDFDriver = dlopen(pfad, RTLD_LAZY); | |
233 | if (!PDFDriver) | |
234 | { | |
235 | @@ -4676,7 +4676,7 @@ | |
236 | QString nam = ""; | |
237 | int ty = 0; | |
238 | struct PlugData pda; | |
239 | - pfad += "/share/scribus/plugins/"; | |
240 | + pfad += "/lib/scribus/plugins/"; | |
241 | QDir d(pfad, "*.so*", QDir::Name, QDir::Files | QDir::Executable | QDir::NoSymLinks); | |
242 | if ((d.exists()) && (d.count() != 0)) | |
243 | { | |
244 | @@ -4719,7 +4719,7 @@ | |
245 | QString pfad = PREL; | |
246 | if (pda.Typ != 4) | |
247 | { | |
248 | - pfad += "/share/scribus/plugins/" + pda.Datei; | |
249 | + pfad += "/lib/scribus/plugins/" + pda.Datei; | |
250 | mo = dlopen(pfad, RTLD_LAZY | RTLD_GLOBAL); | |
251 | if (!mo) | |
252 | { | |
253 | @@ -4753,7 +4753,7 @@ | |
254 | sdem1 demo1; | |
255 | sdem2 demo2; | |
256 | QString pfad = PREL; | |
257 | - pfad += "/share/scribus/plugins/" + name; | |
258 | + pfad += "/lib/scribus/plugins/" + name; | |
259 | mo = dlopen(pfad, RTLD_LAZY | RTLD_GLOBAL); | |
260 | if (!mo) | |
261 | return false; |