]>
Commit | Line | Data |
---|---|---|
77401525 TP |
1 | diff -urN dx-4.3.0.orig/bin/Makefile.am dx-4.3.0/bin/Makefile.am |
2 | --- dx-4.3.0.orig/bin/Makefile.am 2003-07-11 07:41:19.000000000 +0200 | |
3 | +++ dx-4.3.0/bin/Makefile.am 2003-08-09 07:04:25.000000000 +0200 | |
6dece263 | 4 | @@ -1,6 +1,6 @@ |
5 | ## Process this file with automake to produce Makefile.in | |
6 | ||
7 | -dxbindir = $(prefix)/dx/bin | |
8 | +dxbindir = $(prefix)/bin | |
9 | bindir = $(prefix)/bin | |
10 | ||
77401525 TP |
11 | EXTRA_SCRIPTS = mdf2c dx |
12 | diff -urN dx-4.3.0.orig/doc/Makefile.am dx-4.3.0/doc/Makefile.am | |
13 | --- dx-4.3.0.orig/doc/Makefile.am 1999-04-05 13:57:03.000000000 +0200 | |
14 | +++ dx-4.3.0/doc/Makefile.am 2003-08-09 07:04:48.000000000 +0200 | |
6dece263 | 15 | @@ -1,6 +1,6 @@ |
16 | ## Process this file with automake to produce Makefile.in | |
17 | ||
18 | -docdir = $(prefix)/dx/doc | |
77401525 | 19 | +docdir = $(datadir)/doc/dx |
6dece263 | 20 | |
21 | doc_DATA = \ | |
22 | README README_SMP README_alphax README_aviion README_hp700 \ | |
77401525 TP |
23 | diff -urN dx-4.3.0.orig/fonts/Makefile.am dx-4.3.0/fonts/Makefile.am |
24 | --- dx-4.3.0.orig/fonts/Makefile.am 2003-07-11 07:41:19.000000000 +0200 | |
25 | +++ dx-4.3.0/fonts/Makefile.am 2003-08-09 07:04:58.000000000 +0200 | |
6dece263 | 26 | @@ -1,6 +1,6 @@ |
27 | ## Process this file with automake to produce Makefile.in | |
28 | ||
29 | -fontdir = $(prefix)/dx/fonts | |
30 | +fontdir = $(datadir)/dx/fonts | |
31 | ||
32 | font_DATA = \ | |
77401525 TP |
33 | README area.dx cyril_d.dx \ |
34 | diff -urN dx-4.3.0.orig/help/Makefile.am dx-4.3.0/help/Makefile.am | |
35 | --- dx-4.3.0.orig/help/Makefile.am 2003-07-11 07:41:19.000000000 +0200 | |
36 | +++ dx-4.3.0/help/Makefile.am 2003-08-09 07:05:13.000000000 +0200 | |
6dece263 | 37 | @@ -1,6 +1,6 @@ |
38 | ## Process this file with automake to produce Makefile.in | |
39 | ||
40 | -helpdir = $(prefix)/dx/help | |
6978a11b | 41 | +helpdir = $(datadir)/dx/help |
6dece263 | 42 | |
6978a11b | 43 | EXTRA_DIST = $(helpfiles1) $(helpfiles2) $(helpfiles3) $(helpfiles4) $(helpfiles5) \ |
44 | $(helpfiles6) $(helpfiles7) $(helpfiles8) $(helpfiles9) $(helpfiles10) \ | |
77401525 TP |
45 | diff -urN dx-4.3.0.orig/html/images/Makefile.am dx-4.3.0/html/images/Makefile.am |
46 | --- dx-4.3.0.orig/html/images/Makefile.am 2002-04-01 11:04:03.000000000 +0200 | |
47 | +++ dx-4.3.0/html/images/Makefile.am 2003-08-09 07:05:59.000000000 +0200 | |
48 | @@ -1,5 +1,5 @@ | |
49 | ||
50 | -imagesdir = $(prefix)/dx/html/images | |
51 | +imagesdir = $(datadir)/doc/dx/html/images | |
52 | ||
53 | images1 = \ | |
54 | 3dcurs.gif adctlpt.gif arch.gif autoax.gif autoexp.gif \ | |
55 | diff -urN dx-4.3.0.orig/html/Makefile.am dx-4.3.0/html/Makefile.am | |
56 | --- dx-4.3.0.orig/html/Makefile.am 2003-07-11 07:41:19.000000000 +0200 | |
57 | +++ dx-4.3.0/html/Makefile.am 2003-08-09 07:05:47.000000000 +0200 | |
6dece263 | 58 | @@ -1,6 +1,6 @@ |
59 | ## Process this file with automake to produce Makefile.in | |
60 | ||
61 | -htmldir = $(prefix)/dx/html | |
6978a11b | 62 | +htmldir = $(datadir)/doc/dx/html |
63 | ||
64 | SUBDIRS = pages images | |
65 | ||
77401525 TP |
66 | diff -urN dx-4.3.0.orig/html/pages/Makefile.am dx-4.3.0/html/pages/Makefile.am |
67 | --- dx-4.3.0.orig/html/pages/Makefile.am 2002-06-20 06:40:11.000000000 +0200 | |
68 | +++ dx-4.3.0/html/pages/Makefile.am 2003-08-09 07:06:05.000000000 +0200 | |
6978a11b | 69 | @@ -1,4 +1,4 @@ |
70 | -pagesdir = $(prefix)/dx/html/pages | |
71 | +pagesdir = $(datadir)/doc/dx/html/pages | |
72 | ||
73 | pages1 = \ | |
74 | insgu002.htm insgu003.htm insgu004.htm insgu005.htm insgu006.htm \ | |
77401525 TP |
75 | diff -urN dx-4.3.0.orig/include/dx/Makefile.am dx-4.3.0/include/dx/Makefile.am |
76 | --- dx-4.3.0.orig/include/dx/Makefile.am 1999-05-26 01:35:16.000000000 +0200 | |
77 | +++ dx-4.3.0/include/dx/Makefile.am 2003-08-09 07:06:30.000000000 +0200 | |
6dece263 | 78 | @@ -1,6 +1,6 @@ |
79 | ## Process this file with automake to produce Makefile.in | |
80 | ||
81 | -dxincdir = $(prefix)/dx/include/dx | |
6978a11b | 82 | +dxincdir = $(prefix)/include/dx |
6dece263 | 83 | |
84 | dxinc_HEADERS = \ | |
85 | UserInteractors.h advanced.h arch.h array.h arrayhandles.h \ | |
77401525 TP |
86 | diff -urN dx-4.3.0.orig/include/Makefile.am dx-4.3.0/include/Makefile.am |
87 | --- dx-4.3.0.orig/include/Makefile.am 2001-06-29 15:08:15.000000000 +0200 | |
88 | +++ dx-4.3.0/include/Makefile.am 2003-08-09 07:06:19.000000000 +0200 | |
89 | @@ -1,3 +1,3 @@ | |
90 | -dxincdir = $(prefix)/dx/include | |
91 | +dxincdir = $(prefix)/include/dx | |
92 | SUBDIRS = dx | |
93 | dxinc_HEADERS = dxl.h dxconfig.h dxstereo.h | |
94 | diff -urN dx-4.3.0.orig/lib/Makefile.am dx-4.3.0/lib/Makefile.am | |
95 | --- dx-4.3.0.orig/lib/Makefile.am 2003-07-11 07:41:54.000000000 +0200 | |
96 | +++ dx-4.3.0/lib/Makefile.am 2003-08-09 07:06:44.000000000 +0200 | |
97 | @@ -1,4 +1,4 @@ | |
6978a11b | 98 | -libsdir = $(prefix)/dx/lib |
99 | +libsdir = $(prefix)/lib/dx | |
6dece263 | 100 | |
77401525 TP |
101 | libs_DATA = colors.txt dxexec.def dxexec.exp dxexec.ifs dxfSaveCurrentImage.net \ |
102 | dxrc mdf2c.awk messages outboard.c | |
103 | diff -urN dx-4.3.0.orig/man/catl/Makefile.am dx-4.3.0/man/catl/Makefile.am | |
104 | --- dx-4.3.0.orig/man/catl/Makefile.am 1999-04-05 13:56:00.000000000 +0200 | |
105 | +++ dx-4.3.0/man/catl/Makefile.am 2003-08-09 07:07:01.000000000 +0200 | |
6dece263 | 106 | @@ -1,6 +1,6 @@ |
107 | ## Process this file with automake to produce Makefile.in | |
108 | ||
109 | -catdir = $(prefix)/dx/man/catl | |
110 | +catdir = $(datadir)/man/catl | |
111 | ||
112 | cat_DATA = dx.l | |
113 | EXTRA_DIST = $(cat_DATA) | |
77401525 TP |
114 | diff -urN dx-4.3.0.orig/man/manl/Makefile.am dx-4.3.0/man/manl/Makefile.am |
115 | --- dx-4.3.0.orig/man/manl/Makefile.am 2002-05-20 06:49:40.000000000 +0200 | |
116 | +++ dx-4.3.0/man/manl/Makefile.am 2003-08-09 07:07:13.000000000 +0200 | |
6dece263 | 117 | @@ -1,6 +1,6 @@ |
118 | ## Process this file with automake to produce Makefile.in | |
119 | ||
6978a11b | 120 | -mandir = $(prefix)/dx/man |
121 | +mandir = $(datadir)/man | |
6dece263 | 122 | |
6978a11b | 123 | man_MANS = dx.l |
124 | EXTRA_DIST = $(man_MANS) | |
77401525 TP |
125 | diff -urN dx-4.3.0.orig/src/exec/dxexec/Makefile.am dx-4.3.0/src/exec/dxexec/Makefile.am |
126 | --- dx-4.3.0.orig/src/exec/dxexec/Makefile.am 2003-07-11 07:41:55.000000000 +0200 | |
127 | +++ dx-4.3.0/src/exec/dxexec/Makefile.am 2003-08-09 07:08:13.000000000 +0200 | |
128 | @@ -9,7 +9,7 @@ | |
129 | libDXEXEC_la_SOURCES = main.c | |
130 | libDXEXEC_la_CFLAGS = $(AM_CFLAGS) | |
131 | ||
132 | -bindir = $(prefix)/dx/bin_@ARCH@ | |
133 | +bindir = $(prefix)/bin | |
134 | bin_PROGRAMS = dxexec | |
135 | ||
136 | dxexec_LDADD = ../dpexec/libDPEXEC.la ../dxmods/libDXMODS.la ../dxmods/user.lo \ | |
137 | diff -urN dx-4.3.0.orig/src/exec/dxmods/Makefile.am dx-4.3.0/src/exec/dxmods/Makefile.am | |
138 | --- dx-4.3.0.orig/src/exec/dxmods/Makefile.am 2003-07-11 07:41:55.000000000 +0200 | |
139 | +++ dx-4.3.0/src/exec/dxmods/Makefile.am 2003-08-09 07:08:26.000000000 +0200 | |
6dece263 | 140 | @@ -2,7 +2,7 @@ |
141 | ||
6978a11b | 142 | INCLUDES = -I${top_srcdir}/include -I${srcdir}/../dpexec -D@ARCH@ |
6dece263 | 143 | |
144 | -dxmdfdir = $(prefix)/dx/lib | |
6978a11b | 145 | +dxmdfdir = $(prefix)/lib/dx |
77401525 | 146 | noinst_LTLIBRARIES = libDXMODS.la libusercm.la libuser.la libDXMODSN.la |
6dece263 | 147 | SUFFIXES = .c .y .c .s .h .o |
148 | ||
77401525 TP |
149 | diff -urN dx-4.3.0.orig/src/exec/libdx/Makefile.am dx-4.3.0/src/exec/libdx/Makefile.am |
150 | --- dx-4.3.0.orig/src/exec/libdx/Makefile.am 2003-07-11 07:42:09.000000000 +0200 | |
151 | +++ dx-4.3.0/src/exec/libdx/Makefile.am 2003-08-09 07:09:32.000000000 +0200 | |
152 | @@ -7,7 +7,7 @@ | |
6978a11b | 153 | #INCLUDES = -I../../../include -D@ARCH@ |
154 | INCLUDES = -I${top_srcdir}/include -D@ARCH@ | |
6dece263 | 155 | |
156 | -dxlibdir = $(prefix)/dx/lib_@ARCH@ | |
77401525 | 157 | +dxlibdir = $(prefix)/lib/dx |
6dece263 | 158 | |
77401525 TP |
159 | noinst_LTLIBRARIES = libLIBDX.la libcallm.la libmem.la |
160 | #dxlib_LIBRARIES = libDXlite.a | |
161 | diff -urN dx-4.3.0.orig/src/exec/Makefile.am dx-4.3.0/src/exec/Makefile.am | |
162 | --- dx-4.3.0.orig/src/exec/Makefile.am 2003-07-11 07:41:54.000000000 +0200 | |
163 | +++ dx-4.3.0/src/exec/Makefile.am 2003-08-09 07:09:27.000000000 +0200 | |
164 | @@ -1,6 +1,6 @@ | |
165 | SUBDIRS = libdx dxmods hwrender dpexec dxexec | |
166 | ||
167 | -dxlibdir = $(prefix)/dx/lib_@ARCH@ | |
168 | +dxlibdir = $(prefix)/lib/dx | |
169 | ||
170 | MAJOR_VERSION=@MAJOR_VERSION@ | |
171 | MINOR_VERSION=@MINOR_VERSION@ | |
172 | diff -urN dx-4.3.0.orig/src/misc/Makefile.am dx-4.3.0/src/misc/Makefile.am | |
173 | --- dx-4.3.0.orig/src/misc/Makefile.am 2003-07-11 07:42:21.000000000 +0200 | |
174 | +++ dx-4.3.0/src/misc/Makefile.am 2003-08-09 07:10:02.000000000 +0200 | |
6dece263 | 175 | @@ -4,7 +4,7 @@ |
176 | ||
177 | dxbindir = $(prefix)/bin | |
178 | noinst_PROGRAMS = dxlocal | |
179 | -archmakdir = $(prefix)/dx/lib_$(ARCH) | |
77401525 | 180 | +archmakdir = $(prefix)/lib/dx |
6dece263 | 181 | archmak_DATA = arch.mak |
182 | ||
6978a11b | 183 | dxlocal_SOURCES = dx.c utils.c |
77401525 TP |
184 | diff -urN dx-4.3.0.orig/src/uipp/dxl/Makefile.am dx-4.3.0/src/uipp/dxl/Makefile.am |
185 | --- dx-4.3.0.orig/src/uipp/dxl/Makefile.am 2003-07-11 07:42:21.000000000 +0200 | |
186 | +++ dx-4.3.0/src/uipp/dxl/Makefile.am 2003-08-09 07:10:34.000000000 +0200 | |
187 | @@ -7,7 +7,7 @@ | |
6dece263 | 188 | |
6978a11b | 189 | INCLUDES = -I${top_srcdir}/include -D@ARCH@ |
6dece263 | 190 | |
191 | -dxlibdir = $(prefix)/dx/lib_@ARCH@ | |
77401525 | 192 | +dxlibdir = $(prefix)/lib/dx |
6dece263 | 193 | |
77401525 TP |
194 | noinst_HEADERS = \ |
195 | dxlP.h \ | |
196 | diff -urN dx-4.3.0.orig/src/uipp/dxui/Makefile.am dx-4.3.0/src/uipp/dxui/Makefile.am | |
197 | --- dx-4.3.0.orig/src/uipp/dxui/Makefile.am 2003-02-24 19:34:22.000000000 +0100 | |
198 | +++ dx-4.3.0/src/uipp/dxui/Makefile.am 2003-08-09 07:11:17.000000000 +0200 | |
6dece263 | 199 | @@ -2,7 +2,7 @@ |
200 | ||
6978a11b | 201 | INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -I${srcdir}/../dxuilib -D@ARCH@ |
6dece263 | 202 | |
203 | -dxbindir = $(prefix)/dx/bin_@ARCH@ | |
204 | +dxbindir = $(prefix)/bin | |
205 | dxbin_PROGRAMS = dxui | |
206 | ||
207 | ||
77401525 TP |
208 | diff -urN dx-4.3.0.orig/src/uipp/java/Makefile.am dx-4.3.0/src/uipp/java/Makefile.am |
209 | --- dx-4.3.0.orig/src/uipp/java/Makefile.am 2003-07-11 07:42:22.000000000 +0200 | |
210 | +++ dx-4.3.0/src/uipp/java/Makefile.am 2003-08-09 07:11:45.000000000 +0200 | |
88c8864d TP |
211 | @@ -27,12 +27,12 @@ |
212 | ## libtool and the -shrext flag to make this much more | |
213 | ## portable. | |
214 | ||
6978a11b | 215 | -javadxdir = $(prefix)/dx/java/htmlpages |
216 | +javadxdir = $(datadir)/dx/java/htmlpages | |
217 | javadx_DATA = dx.jar | |
218 | -javasrvdir = $(prefix)/dx/java/server/class | |
219 | +javasrvdir = $(datadir)/dx/java/server/class | |
220 | javasrv_DATA = server.jar | |
77401525 | 221 | EXTRA_DIST = $(DX_SRCS) DXServer.java makeall.java makewrl.java exports.awk README |
6978a11b | 222 | -javalibdir = $(prefix)/dx/java/server/lib_@ARCH@ |
223 | +javalibdir = $(datadir)/dx/java/server/lib | |
224 | ||
225 | javalib_DATA = @ANYDX@ | |
77401525 TP |
226 | SUBDIRS = server dx |
227 | diff -urN dx-4.3.0.orig/src/uipp/java/server/macros/Makefile.am dx-4.3.0/src/uipp/java/server/macros/Makefile.am | |
228 | --- dx-4.3.0.orig/src/uipp/java/server/macros/Makefile.am 1999-07-09 21:25:13.000000000 +0200 | |
229 | +++ dx-4.3.0/src/uipp/java/server/macros/Makefile.am 2003-08-09 07:12:19.000000000 +0200 | |
230 | @@ -1,6 +1,6 @@ | |
231 | ## Process this file with automake to produce Makefile.in | |
232 | ||
233 | -serverdatadir = $(prefix)/dx/java/server/dxmacros | |
234 | +serverdatadir = $(datadir)/dx/java/server/dxmacros | |
235 | ||
236 | serverdata_DATA = $(MACRO_FILES) | |
237 | ||
238 | diff -urN dx-4.3.0.orig/src/uipp/java/server/Makefile.am dx-4.3.0/src/uipp/java/server/Makefile.am | |
239 | --- dx-4.3.0.orig/src/uipp/java/server/Makefile.am 2001-05-31 16:50:15.000000000 +0200 | |
240 | +++ dx-4.3.0/src/uipp/java/server/Makefile.am 2003-08-09 07:12:02.000000000 +0200 | |
6978a11b | 241 | @@ -1,6 +1,6 @@ |
242 | -srvbindir = $(prefix)/dx/java/server/bin | |
243 | -srvoutputdir = $(prefix)/dx/java/output | |
244 | -userhtmldir = $(prefix)/dx/java/user | |
245 | +srvbindir = $(datadir)/dx/java/server/bin | |
246 | +srvoutputdir = $(datadir)/dx/java/output | |
247 | +userhtmldir = $(datadir)/dx/java/user | |
248 | # the server script (in srvbindir) will actually cd and run from the class subdir so that java will find the classes | |
249 | # the server will expect to find a file dxserver.paths there to tell the exec where to find .net files | |
250 | srvrundir = $(srvbindir)/../class | |
77401525 TP |
251 | diff -urN dx-4.3.0.orig/src/uipp/mb/Makefile.am dx-4.3.0/src/uipp/mb/Makefile.am |
252 | --- dx-4.3.0.orig/src/uipp/mb/Makefile.am 2003-07-11 07:42:22.000000000 +0200 | |
253 | +++ dx-4.3.0/src/uipp/mb/Makefile.am 2003-08-09 07:12:50.000000000 +0200 | |
6dece263 | 254 | @@ -2,7 +2,7 @@ |
255 | ||
6978a11b | 256 | INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -I${srcdir}/../widgets -D@ARCH@ |
6dece263 | 257 | |
258 | -dxbindir = $(prefix)/dx/bin_@ARCH@ | |
259 | +dxbindir = $(prefix)/bin | |
260 | ||
261 | dxbin_PROGRAMS = builder | |
262 | ||
77401525 TP |
263 | diff -urN dx-4.3.0.orig/src/uipp/prompter/Makefile.am dx-4.3.0/src/uipp/prompter/Makefile.am |
264 | --- dx-4.3.0.orig/src/uipp/prompter/Makefile.am 2003-07-11 07:42:23.000000000 +0200 | |
265 | +++ dx-4.3.0/src/uipp/prompter/Makefile.am 2003-08-09 07:13:04.000000000 +0200 | |
6dece263 | 266 | @@ -2,7 +2,7 @@ |
267 | ||
6978a11b | 268 | INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -D@ARCH@ |
6dece263 | 269 | |
270 | -dxbindir = $(prefix)/dx/bin_@ARCH@ | |
271 | +dxbindir = $(prefix)/bin | |
272 | ||
273 | dxbin_PROGRAMS = prompter | |
274 | ||
77401525 TP |
275 | diff -urN dx-4.3.0.orig/src/uipp/startup/Makefile.am dx-4.3.0/src/uipp/startup/Makefile.am |
276 | --- dx-4.3.0.orig/src/uipp/startup/Makefile.am 2003-07-11 07:42:23.000000000 +0200 | |
277 | +++ dx-4.3.0/src/uipp/startup/Makefile.am 2003-08-09 07:13:17.000000000 +0200 | |
6dece263 | 278 | @@ -2,7 +2,7 @@ |
279 | ||
6978a11b | 280 | INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D@ARCH@ |
6dece263 | 281 | |
282 | -dxbindir = $(prefix)/dx/bin_@ARCH@ | |
283 | +dxbindir = $(prefix)/bin | |
284 | ||
285 | dxbin_PROGRAMS = startupui | |
286 | ||
77401525 TP |
287 | diff -urN dx-4.3.0.orig/src/uipp/tutor/Makefile.am dx-4.3.0/src/uipp/tutor/Makefile.am |
288 | --- dx-4.3.0.orig/src/uipp/tutor/Makefile.am 2003-07-11 07:42:23.000000000 +0200 | |
289 | +++ dx-4.3.0/src/uipp/tutor/Makefile.am 2003-08-09 07:13:26.000000000 +0200 | |
6dece263 | 290 | @@ -2,7 +2,7 @@ |
291 | ||
6978a11b | 292 | INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D@ARCH@ |
6dece263 | 293 | |
294 | -dxbindir = $(prefix)/dx/bin_@ARCH@ | |
295 | +dxbindir = $(prefix)/bin | |
296 | ||
297 | dxbin_PROGRAMS = tutor | |
298 | ||
77401525 TP |
299 | diff -urN dx-4.3.0.orig/src/uipp/ui/Makefile.am dx-4.3.0/src/uipp/ui/Makefile.am |
300 | --- dx-4.3.0.orig/src/uipp/ui/Makefile.am 2001-04-12 16:29:02.000000000 +0200 | |
301 | +++ dx-4.3.0/src/uipp/ui/Makefile.am 2003-08-09 07:13:48.000000000 +0200 | |
6dece263 | 302 | @@ -1,6 +1,6 @@ |
303 | ## Process this file with automake to produce Makefile.in | |
304 | ||
305 | -uidatadir = $(prefix)/dx/ui | |
306 | +uidatadir = $(datadir)/dx/ui | |
307 | ||
308 | DATA1 = \ | |
6978a11b | 309 | icon50.dat icon50.xpm logo.dat logo.xpm ui.mdf Basic2D.cfg Basic2D.net \ |