1 diff -urN dx-4.2.0.orig/bin/Makefile.am dx-4.2.0/bin/Makefile.am
2 --- dx-4.2.0.orig/bin/Makefile.am Thu Apr 11 01:32:53 2002
3 +++ dx-4.2.0/bin/Makefile.am Tue Jul 16 22:19:38 2002
5 ## Process this file with automake to produce Makefile.in
7 -dxbindir = $(prefix)/dx/bin
8 +dxbindir = $(prefix)/bin
11 EXTRA_DIST = dxworker dx mdf2c url_handler.sh
12 diff -urN dx-4.2.0.orig/doc/Makefile.am dx-4.2.0/doc/Makefile.am
13 --- dx-4.2.0.orig/doc/Makefile.am Mon Apr 5 13:57:03 1999
14 +++ dx-4.2.0/doc/Makefile.am Tue Jul 16 22:19:38 2002
16 ## Process this file with automake to produce Makefile.in
18 -docdir = $(prefix)/dx/doc
19 +docdir = $(datadir)/doc/dx/
22 README README_SMP README_alphax README_aviion README_hp700 \
23 diff -urN dx-4.2.0.orig/fonts/Makefile.am dx-4.2.0/fonts/Makefile.am
24 --- dx-4.2.0.orig/fonts/Makefile.am Tue Jun 15 17:54:34 1999
25 +++ dx-4.2.0/fonts/Makefile.am Tue Jul 16 22:19:38 2002
27 ## Process this file with automake to produce Makefile.in
29 -fontdir = $(prefix)/dx/fonts
30 +fontdir = $(datadir)/dx/fonts
33 Readme area.dx cyril_d.dx \
34 diff -urN dx-4.2.0.orig/help/Makefile.am dx-4.2.0/help/Makefile.am
35 --- dx-4.2.0.orig/help/Makefile.am Thu May 2 17:42:31 2002
36 +++ dx-4.2.0/help/Makefile.am Tue Jul 16 22:19:38 2002
38 ## Process this file with automake to produce Makefile.in
40 -helpdir = $(prefix)/dx/help
41 +helpdir = $(datadir)/dx/help
43 EXTRA_DIST = $(helpfiles1) $(helpfiles2) $(helpfiles3) $(helpfiles4) $(helpfiles5) \
44 $(helpfiles6) $(helpfiles7) $(helpfiles8) $(helpfiles9) $(helpfiles10) \
45 diff -urN dx-4.2.0.orig/html/Makefile.am dx-4.2.0/html/Makefile.am
46 --- dx-4.2.0.orig/html/Makefile.am Tue Apr 30 19:51:33 2002
47 +++ dx-4.2.0/html/Makefile.am Tue Jul 16 22:19:38 2002
49 ## Process this file with automake to produce Makefile.in
51 -htmldir = $(prefix)/dx/html
52 +htmldir = $(datadir)/doc/dx/html
54 SUBDIRS = pages images
56 diff -urN dx-4.2.0.orig/html/images/Makefile.am dx-4.2.0/html/images/Makefile.am
57 --- dx-4.2.0.orig/html/images/Makefile.am Mon Apr 1 11:04:03 2002
58 +++ dx-4.2.0/html/images/Makefile.am Tue Jul 16 22:19:38 2002
61 -imagesdir = $(prefix)/dx/html/images
62 +imagesdir = $(datadir)/doc/dx/html/images
65 3dcurs.gif adctlpt.gif arch.gif autoax.gif autoexp.gif \
66 diff -urN dx-4.2.0.orig/html/pages/Makefile.am dx-4.2.0/html/pages/Makefile.am
67 --- dx-4.2.0.orig/html/pages/Makefile.am Mon Apr 1 11:04:03 2002
68 +++ dx-4.2.0/html/pages/Makefile.am Tue Jul 16 22:19:38 2002
70 -pagesdir = $(prefix)/dx/html/pages
71 +pagesdir = $(datadir)/doc/dx/html/pages
74 insgu002.htm insgu003.htm insgu004.htm insgu005.htm insgu006.htm \
75 diff -urN dx-4.2.0.orig/include/Makefile.am dx-4.2.0/include/Makefile.am
76 --- dx-4.2.0.orig/include/Makefile.am Fri Jun 29 15:08:15 2001
77 +++ dx-4.2.0/include/Makefile.am Tue Jul 16 22:19:38 2002
79 -dxincdir = $(prefix)/dx/include
80 +dxincdir = $(prefix)/include/dx
82 dxinc_HEADERS = dxl.h dxconfig.h dxstereo.h
83 diff -urN dx-4.2.0.orig/include/dx/Makefile.am dx-4.2.0/include/dx/Makefile.am
84 --- dx-4.2.0.orig/include/dx/Makefile.am Wed May 26 01:35:16 1999
85 +++ dx-4.2.0/include/dx/Makefile.am Tue Jul 16 22:19:38 2002
87 ## Process this file with automake to produce Makefile.in
89 -dxincdir = $(prefix)/dx/include/dx
90 +dxincdir = $(prefix)/include/dx
93 UserInteractors.h advanced.h arch.h array.h arrayhandles.h \
94 diff -urN dx-4.2.0.orig/lib/Makefile.am dx-4.2.0/lib/Makefile.am
95 --- dx-4.2.0.orig/lib/Makefile.am Fri Mar 29 15:42:54 2002
96 +++ dx-4.2.0/lib/Makefile.am Tue Jul 16 22:19:38 2002
99 -libsdir = $(prefix)/dx/lib
100 +libsdir = $(prefix)/lib/dx
102 libs_DATA = mdf2c.awk messages colors.txt dxfSaveCurrentImage.net dxrc dxexec.exp outboard.c
103 EXTRA_DIST = $(libs_DATA)
104 diff -urN dx-4.2.0.orig/man/catl/Makefile.am dx-4.2.0/man/catl/Makefile.am
105 --- dx-4.2.0.orig/man/catl/Makefile.am Mon Apr 5 13:56:00 1999
106 +++ dx-4.2.0/man/catl/Makefile.am Tue Jul 16 22:19:38 2002
108 ## Process this file with automake to produce Makefile.in
110 -catdir = $(prefix)/dx/man/catl
111 +catdir = $(datadir)/man/catl
114 EXTRA_DIST = $(cat_DATA)
115 diff -urN dx-4.2.0.orig/man/manl/Makefile.am dx-4.2.0/man/manl/Makefile.am
116 --- dx-4.2.0.orig/man/manl/Makefile.am Mon May 20 06:49:40 2002
117 +++ dx-4.2.0/man/manl/Makefile.am Tue Jul 16 22:19:38 2002
119 ## Process this file with automake to produce Makefile.in
121 -mandir = $(prefix)/dx/man
122 +mandir = $(datadir)/man
125 EXTRA_DIST = $(man_MANS)
126 diff -urN dx-4.2.0.orig/src/exec/dxexec/Makefile.am dx-4.2.0/src/exec/dxexec/Makefile.am
127 --- dx-4.2.0.orig/src/exec/dxexec/Makefile.am Fri Apr 19 02:42:28 2002
128 +++ dx-4.2.0/src/exec/dxexec/Makefile.am Tue Jul 16 22:19:38 2002
130 EXP=${top_srcdir}/lib/dxexec.exp
131 WEXP=${top_srcdir}/lib/dxexec.def
133 -dxbindir = $(prefix)/dx/bin_@ARCH@
134 +dxbindir = $(prefix)/bin
135 dxbin_PROGRAMS = dxexec
136 noinst_LIBRARIES = libDXEXEC.a
138 diff -urN dx-4.2.0.orig/src/exec/dxmods/Makefile.am dx-4.2.0/src/exec/dxmods/Makefile.am
139 --- dx-4.2.0.orig/src/exec/dxmods/Makefile.am Thu May 31 16:50:13 2001
140 +++ dx-4.2.0/src/exec/dxmods/Makefile.am Tue Jul 16 22:19:38 2002
143 INCLUDES = -I${top_srcdir}/include -I${srcdir}/../dpexec -D@ARCH@
145 -dxmdfdir = $(prefix)/dx/lib
146 +dxmdfdir = $(prefix)/lib/dx
147 noinst_LIBRARIES = libDXMODS.a libusercm.a
148 SUFFIXES = .c .y .c .s .h .o
150 diff -urN dx-4.2.0.orig/src/exec/libdx/Makefile.am dx-4.2.0/src/exec/libdx/Makefile.am
151 --- dx-4.2.0.orig/src/exec/libdx/Makefile.am Sat Feb 16 16:36:57 2002
152 +++ dx-4.2.0/src/exec/libdx/Makefile.am Tue Jul 16 22:19:38 2002
154 #INCLUDES = -I../../../include -D@ARCH@
155 INCLUDES = -I${top_srcdir}/include -D@ARCH@
157 -dxlibdir = $(prefix)/dx/lib_@ARCH@
158 +dxlibdir = $(prefix)/lib
160 noinst_LIBRARIES = libLIBDX.a libcallm.a
161 dxlib_LIBRARIES = libDXlite.a
162 diff -urN dx-4.2.0.orig/src/misc/Makefile.am dx-4.2.0/src/misc/Makefile.am
163 --- dx-4.2.0.orig/src/misc/Makefile.am Mon Nov 26 21:40:58 2001
164 +++ dx-4.2.0/src/misc/Makefile.am Tue Jul 16 22:19:38 2002
167 dxbindir = $(prefix)/bin
168 noinst_PROGRAMS = dxlocal
169 -archmakdir = $(prefix)/dx/lib_$(ARCH)
170 +archmakdir = $(prefix)/lib/dx/
171 archmak_DATA = arch.mak
173 dxlocal_SOURCES = dx.c utils.c
174 diff -urN dx-4.2.0.orig/src/uipp/dxl/Makefile.am dx-4.2.0/src/uipp/dxl/Makefile.am
175 --- dx-4.2.0.orig/src/uipp/dxl/Makefile.am Fri Jun 9 04:46:15 2000
176 +++ dx-4.2.0/src/uipp/dxl/Makefile.am Tue Jul 16 22:19:38 2002
179 INCLUDES = -I${top_srcdir}/include -D@ARCH@
181 -dxlibdir = $(prefix)/dx/lib_@ARCH@
182 +dxlibdir = $(prefix)/lib
184 dxlib_LIBRARIES = libDXL.a
186 diff -urN dx-4.2.0.orig/src/uipp/dxui/Makefile.am dx-4.2.0/src/uipp/dxui/Makefile.am
187 --- dx-4.2.0.orig/src/uipp/dxui/Makefile.am Sat Feb 16 16:36:58 2002
188 +++ dx-4.2.0/src/uipp/dxui/Makefile.am Tue Jul 16 22:19:38 2002
191 INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -I${srcdir}/../dxuilib -D@ARCH@
193 -dxbindir = $(prefix)/dx/bin_@ARCH@
194 +dxbindir = $(prefix)/bin
195 dxbin_PROGRAMS = dxui
198 diff -urN dx-4.2.0.orig/src/uipp/java/Makefile.am dx-4.2.0/src/uipp/java/Makefile.am
199 --- dx-4.2.0.orig/src/uipp/java/Makefile.am Thu May 2 20:47:47 2002
200 +++ dx-4.2.0/src/uipp/java/Makefile.am Tue Jul 16 22:19:38 2002
202 ## to the directory arg following the -d. The
203 ## result is a place which is easy to jar up.
205 -javadxdir = $(prefix)/dx/java/htmlpages
206 +javadxdir = $(datadir)/dx/java/htmlpages
208 -javasrvdir = $(prefix)/dx/java/server/class
209 +javasrvdir = $(datadir)/dx/java/server/class
210 javasrv_DATA = server.jar
211 EXTRA_DIST = $(DX_SRCS) DXServer.java makeall.java makewrl.java exports.awk
212 -javalibdir = $(prefix)/dx/java/server/lib_@ARCH@
213 +javalibdir = $(datadir)/dx/java/server/lib
215 javalib_DATA = @ANYDX@
216 # EXTRA_PROGRAMS = libAnyDX.so AnyDX.dll
217 diff -urN dx-4.2.0.orig/src/uipp/java/server/Makefile.am dx-4.2.0/src/uipp/java/server/Makefile.am
218 --- dx-4.2.0.orig/src/uipp/java/server/Makefile.am Thu May 31 16:50:15 2001
219 +++ dx-4.2.0/src/uipp/java/server/Makefile.am Tue Jul 16 22:19:38 2002
221 -srvbindir = $(prefix)/dx/java/server/bin
222 -srvoutputdir = $(prefix)/dx/java/output
223 -userhtmldir = $(prefix)/dx/java/user
224 +srvbindir = $(datadir)/dx/java/server/bin
225 +srvoutputdir = $(datadir)/dx/java/output
226 +userhtmldir = $(datadir)/dx/java/user
227 # the server script (in srvbindir) will actually cd and run from the class subdir so that java will find the classes
228 # the server will expect to find a file dxserver.paths there to tell the exec where to find .net files
229 srvrundir = $(srvbindir)/../class
230 diff -urN dx-4.2.0.orig/src/uipp/java/server/macros/Makefile.am dx-4.2.0/src/uipp/java/server/macros/Makefile.am
231 --- dx-4.2.0.orig/src/uipp/java/server/macros/Makefile.am Fri Jul 9 21:25:13 1999
232 +++ dx-4.2.0/src/uipp/java/server/macros/Makefile.am Tue Jul 16 22:19:38 2002
234 ## Process this file with automake to produce Makefile.in
236 -serverdatadir = $(prefix)/dx/java/server/dxmacros
237 +serverdatadir = $(datadir)/dx/java/server/dxmacros
239 serverdata_DATA = $(MACRO_FILES)
241 diff -urN dx-4.2.0.orig/src/uipp/mb/Makefile.am dx-4.2.0/src/uipp/mb/Makefile.am
242 --- dx-4.2.0.orig/src/uipp/mb/Makefile.am Wed Apr 3 02:56:22 2002
243 +++ dx-4.2.0/src/uipp/mb/Makefile.am Tue Jul 16 22:19:38 2002
246 INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -I${srcdir}/../widgets -D@ARCH@
248 -dxbindir = $(prefix)/dx/bin_@ARCH@
249 +dxbindir = $(prefix)/bin
251 dxbin_PROGRAMS = builder
253 diff -urN dx-4.2.0.orig/src/uipp/prompter/Makefile.am dx-4.2.0/src/uipp/prompter/Makefile.am
254 --- dx-4.2.0.orig/src/uipp/prompter/Makefile.am Wed Apr 3 02:56:22 2002
255 +++ dx-4.2.0/src/uipp/prompter/Makefile.am Tue Jul 16 22:19:38 2002
258 INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -D@ARCH@
260 -dxbindir = $(prefix)/dx/bin_@ARCH@
261 +dxbindir = $(prefix)/bin
263 dxbin_PROGRAMS = prompter
265 diff -urN dx-4.2.0.orig/src/uipp/startup/Makefile.am dx-4.2.0/src/uipp/startup/Makefile.am
266 --- dx-4.2.0.orig/src/uipp/startup/Makefile.am Wed Apr 3 02:56:24 2002
267 +++ dx-4.2.0/src/uipp/startup/Makefile.am Tue Jul 16 22:19:38 2002
270 INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D@ARCH@
272 -dxbindir = $(prefix)/dx/bin_@ARCH@
273 +dxbindir = $(prefix)/bin
275 dxbin_PROGRAMS = startupui
277 diff -urN dx-4.2.0.orig/src/uipp/tutor/Makefile.am dx-4.2.0/src/uipp/tutor/Makefile.am
278 --- dx-4.2.0.orig/src/uipp/tutor/Makefile.am Wed Apr 3 02:56:23 2002
279 +++ dx-4.2.0/src/uipp/tutor/Makefile.am Tue Jul 16 22:19:38 2002
282 INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D@ARCH@
284 -dxbindir = $(prefix)/dx/bin_@ARCH@
285 +dxbindir = $(prefix)/bin
287 dxbin_PROGRAMS = tutor
289 diff -urN dx-4.2.0.orig/src/uipp/ui/Makefile.am dx-4.2.0/src/uipp/ui/Makefile.am
290 --- dx-4.2.0.orig/src/uipp/ui/Makefile.am Thu Apr 12 16:29:02 2001
291 +++ dx-4.2.0/src/uipp/ui/Makefile.am Tue Jul 16 22:19:38 2002
293 ## Process this file with automake to produce Makefile.in
295 -uidatadir = $(prefix)/dx/ui
296 +uidatadir = $(datadir)/dx/ui
299 icon50.dat icon50.xpm logo.dat logo.xpm ui.mdf Basic2D.cfg Basic2D.net \