1 diff -urN dxsamples-4.4.0.orig/programs/2D_DATA/Makefile.am dxsamples-4.4.0/programs/2D_DATA/Makefile.am
2 --- dxsamples-4.4.0.orig/programs/2D_DATA/Makefile.am 2002-04-30 20:53:26.000000000 +0200
3 +++ dxsamples-4.4.0/programs/2D_DATA/Makefile.am 2005-05-06 15:12:07.000000000 +0200
5 ## Process this file with automake to produce Makefile.in
7 -sampleprogdir = $(prefix)/dx/samples/programs/2D_DATA
8 +sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/2D_DATA
11 AlternateVisualizations.cfg\
12 diff -urN dxsamples-4.4.0.orig/programs/3D_DATA/Makefile.am dxsamples-4.4.0/programs/3D_DATA/Makefile.am
13 --- dxsamples-4.4.0.orig/programs/3D_DATA/Makefile.am 2002-04-30 20:53:26.000000000 +0200
14 +++ dxsamples-4.4.0/programs/3D_DATA/Makefile.am 2005-05-06 15:12:00.000000000 +0200
16 ## Process this file with automake to produce Makefile.in
18 -sampleprogdir = $(prefix)/dx/samples/programs/3D_DATA
19 +sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/3D_DATA
23 diff -urN dxsamples-4.4.0.orig/programs/ANNOTATION/Makefile.am dxsamples-4.4.0/programs/ANNOTATION/Makefile.am
24 --- dxsamples-4.4.0.orig/programs/ANNOTATION/Makefile.am 2002-04-30 20:53:25.000000000 +0200
25 +++ dxsamples-4.4.0/programs/ANNOTATION/Makefile.am 2005-05-06 15:11:35.000000000 +0200
27 ## Process this file with automake to produce Makefile.in
29 -sampleprogdir = $(prefix)/dx/samples/programs/ANNOTATION
30 +sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/ANNOTATION
34 diff -urN dxsamples-4.4.0.orig/programs/CATEGORICAL/Makefile.am dxsamples-4.4.0/programs/CATEGORICAL/Makefile.am
35 --- dxsamples-4.4.0.orig/programs/CATEGORICAL/Makefile.am 2002-04-30 20:53:24.000000000 +0200
36 +++ dxsamples-4.4.0/programs/CATEGORICAL/Makefile.am 2005-05-06 15:11:46.000000000 +0200
38 ## Process this file with automake to produce Makefile.in
40 -sampleprogdir = $(prefix)/dx/samples/programs/CATEGORICAL
41 +sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/CATEGORICAL
45 diff -urN dxsamples-4.4.0.orig/programs/COLORMAP_EDITOR/Makefile.am dxsamples-4.4.0/programs/COLORMAP_EDITOR/Makefile.am
46 --- dxsamples-4.4.0.orig/programs/COLORMAP_EDITOR/Makefile.am 2002-04-30 20:53:23.000000000 +0200
47 +++ dxsamples-4.4.0/programs/COLORMAP_EDITOR/Makefile.am 2005-05-06 15:12:04.000000000 +0200
49 ## Process this file with automake to produce Makefile.in
51 -sampleprogdir = $(prefix)/dx/samples/programs/COLORMAP_EDITOR
52 +sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/COLORMAP_EDITOR
55 DataDrivenInteractors.cfg\
56 diff -urN dxsamples-4.4.0.orig/programs/COMPUTE/Makefile.am dxsamples-4.4.0/programs/COMPUTE/Makefile.am
57 --- dxsamples-4.4.0.orig/programs/COMPUTE/Makefile.am 2002-04-30 20:53:23.000000000 +0200
58 +++ dxsamples-4.4.0/programs/COMPUTE/Makefile.am 2005-05-06 15:11:27.000000000 +0200
60 ## Process this file with automake to produce Makefile.in
62 -sampleprogdir = $(prefix)/dx/samples/programs/COMPUTE
63 +sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/COMPUTE
67 diff -urN dxsamples-4.4.0.orig/programs/DATA_DRIVEN_INTERACTORS/Makefile.am dxsamples-4.4.0/programs/DATA_DRIVEN_INTERACTORS/Makefile.am
68 --- dxsamples-4.4.0.orig/programs/DATA_DRIVEN_INTERACTORS/Makefile.am 2002-04-30 20:53:22.000000000 +0200
69 +++ dxsamples-4.4.0/programs/DATA_DRIVEN_INTERACTORS/Makefile.am 2005-05-06 15:11:39.000000000 +0200
71 ## Process this file with automake to produce Makefile.in
73 -sampleprogdir = $(prefix)/dx/samples/programs/DATA_DRIVEN_INTERACTORS
74 +sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/DATA_DRIVEN_INTERACTORS
77 DataDrivenInteractors.cfg\
78 diff -urN dxsamples-4.4.0.orig/programs/DEBUGGING/Makefile.am dxsamples-4.4.0/programs/DEBUGGING/Makefile.am
79 --- dxsamples-4.4.0.orig/programs/DEBUGGING/Makefile.am 2002-04-30 20:53:21.000000000 +0200
80 +++ dxsamples-4.4.0/programs/DEBUGGING/Makefile.am 2005-05-06 15:11:57.000000000 +0200
82 ## Process this file with automake to produce Makefile.in
84 -sampleprogdir = $(prefix)/dx/samples/programs/DEBUGGING
85 +sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/DEBUGGING
89 diff -urN dxsamples-4.4.0.orig/programs/DISTRIBUTED_PROCESSING/Makefile.am dxsamples-4.4.0/programs/DISTRIBUTED_PROCESSING/Makefile.am
90 --- dxsamples-4.4.0.orig/programs/DISTRIBUTED_PROCESSING/Makefile.am 2002-04-30 20:53:20.000000000 +0200
91 +++ dxsamples-4.4.0/programs/DISTRIBUTED_PROCESSING/Makefile.am 2005-05-06 15:12:20.000000000 +0200
93 ## Process this file with automake to produce Makefile.in
95 -sampleprogdir = $(prefix)/dx/samples/programs/DISTRIBUTED_PROCESSING
96 +sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/DISTRIBUTED_PROCESSING
100 diff -urN dxsamples-4.4.0.orig/programs/IMAGE_PROCESSING/Makefile.am dxsamples-4.4.0/programs/IMAGE_PROCESSING/Makefile.am
101 --- dxsamples-4.4.0.orig/programs/IMAGE_PROCESSING/Makefile.am 2002-04-30 20:53:20.000000000 +0200
102 +++ dxsamples-4.4.0/programs/IMAGE_PROCESSING/Makefile.am 2005-05-06 15:12:10.000000000 +0200
104 ## Process this file with automake to produce Makefile.in
106 -sampleprogdir = $(prefix)/dx/samples/programs/IMAGE_PROCESSING
107 +sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/IMAGE_PROCESSING
111 diff -urN dxsamples-4.4.0.orig/programs/IMPORTING/Makefile.am dxsamples-4.4.0/programs/IMPORTING/Makefile.am
112 --- dxsamples-4.4.0.orig/programs/IMPORTING/Makefile.am 2002-04-30 20:53:19.000000000 +0200
113 +++ dxsamples-4.4.0/programs/IMPORTING/Makefile.am 2005-05-06 15:12:32.000000000 +0200
115 ## Process this file with automake to produce Makefile.in
117 -sampleprogdir = $(prefix)/dx/samples/programs/IMPORTING
118 +sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/IMPORTING
122 diff -urN dxsamples-4.4.0.orig/programs/INTERFACE_CONTROL/Makefile.am dxsamples-4.4.0/programs/INTERFACE_CONTROL/Makefile.am
123 --- dxsamples-4.4.0.orig/programs/INTERFACE_CONTROL/Makefile.am 2002-04-30 20:53:18.000000000 +0200
124 +++ dxsamples-4.4.0/programs/INTERFACE_CONTROL/Makefile.am 2005-05-06 15:12:28.000000000 +0200
126 ## Process this file with automake to produce Makefile.in
128 -sampleprogdir = $(prefix)/dx/samples/programs/INTERFACE_CONTROL
129 +sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/INTERFACE_CONTROL
133 diff -urN dxsamples-4.4.0.orig/programs/LOOPING/Makefile.am dxsamples-4.4.0/programs/LOOPING/Makefile.am
134 --- dxsamples-4.4.0.orig/programs/LOOPING/Makefile.am 2002-04-30 20:53:17.000000000 +0200
135 +++ dxsamples-4.4.0/programs/LOOPING/Makefile.am 2005-05-06 15:12:17.000000000 +0200
137 ## Process this file with automake to produce Makefile.in
139 -sampleprogdir = $(prefix)/dx/samples/programs/LOOPING
140 +sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/LOOPING
144 diff -urN dxsamples-4.4.0.orig/programs/MISC/Makefile.am dxsamples-4.4.0/programs/MISC/Makefile.am
145 --- dxsamples-4.4.0.orig/programs/MISC/Makefile.am 2002-04-30 20:53:13.000000000 +0200
146 +++ dxsamples-4.4.0/programs/MISC/Makefile.am 2005-05-06 15:12:38.000000000 +0200
148 ## Process this file with automake to produce Makefile.in
150 -sampleprogdir = $(prefix)/dx/samples/programs/MISC
151 +sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/MISC
155 diff -urN dxsamples-4.4.0.orig/programs/PLOTTING/Makefile.am dxsamples-4.4.0/programs/PLOTTING/Makefile.am
156 --- dxsamples-4.4.0.orig/programs/PLOTTING/Makefile.am 2002-04-30 20:53:12.000000000 +0200
157 +++ dxsamples-4.4.0/programs/PLOTTING/Makefile.am 2005-05-06 15:11:54.000000000 +0200
159 ## Process this file with automake to produce Makefile.in
161 -sampleprogdir = $(prefix)/dx/samples/programs/PLOTTING
162 +sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/PLOTTING
166 diff -urN dxsamples-4.4.0.orig/programs/PROBES/Makefile.am dxsamples-4.4.0/programs/PROBES/Makefile.am
167 --- dxsamples-4.4.0.orig/programs/PROBES/Makefile.am 2002-04-30 20:53:11.000000000 +0200
168 +++ dxsamples-4.4.0/programs/PROBES/Makefile.am 2005-05-06 15:12:25.000000000 +0200
170 ## Process this file with automake to produce Makefile.in
172 -sampleprogdir = $(prefix)/dx/samples/programs/PROBES
173 +sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/PROBES
177 diff -urN dxsamples-4.4.0.orig/programs/RENDERING/Makefile.am dxsamples-4.4.0/programs/RENDERING/Makefile.am
178 --- dxsamples-4.4.0.orig/programs/RENDERING/Makefile.am 2002-04-30 20:53:10.000000000 +0200
179 +++ dxsamples-4.4.0/programs/RENDERING/Makefile.am 2005-05-06 15:12:35.000000000 +0200
181 ## Process this file with automake to produce Makefile.in
183 -sampleprogdir = $(prefix)/dx/samples/programs/RENDERING
184 +sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/RENDERING
188 diff -urN dxsamples-4.4.0.orig/programs/SCATTERED/Makefile.am dxsamples-4.4.0/programs/SCATTERED/Makefile.am
189 --- dxsamples-4.4.0.orig/programs/SCATTERED/Makefile.am 2002-04-30 20:53:08.000000000 +0200
190 +++ dxsamples-4.4.0/programs/SCATTERED/Makefile.am 2005-05-06 15:11:43.000000000 +0200
192 ## Process this file with automake to produce Makefile.in
194 -sampleprogdir = $(prefix)/dx/samples/programs/SCATTERED
195 +sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/SCATTERED
198 AnnotationGlyphs.cfg\
199 diff -urN dxsamples-4.4.0.orig/programs/SEQUENCER/Makefile.am dxsamples-4.4.0/programs/SEQUENCER/Makefile.am
200 --- dxsamples-4.4.0.orig/programs/SEQUENCER/Makefile.am 2002-04-30 20:53:07.000000000 +0200
201 +++ dxsamples-4.4.0/programs/SEQUENCER/Makefile.am 2005-05-06 15:12:12.000000000 +0200
203 ## Process this file with automake to produce Makefile.in
205 -sampleprogdir = $(prefix)/dx/samples/programs/SEQUENCER
206 +sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/SEQUENCER
209 ContoursAndCaption.cfg\
210 diff -urN dxsamples-4.4.0.orig/programs/SIMPLE/Makefile.am dxsamples-4.4.0/programs/SIMPLE/Makefile.am
211 --- dxsamples-4.4.0.orig/programs/SIMPLE/Makefile.am 2002-04-30 20:53:06.000000000 +0200
212 +++ dxsamples-4.4.0/programs/SIMPLE/Makefile.am 2005-05-06 15:12:22.000000000 +0200
214 ## Process this file with automake to produce Makefile.in
216 -sampleprogdir = $(prefix)/dx/samples/programs/SIMPLE
217 +sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/SIMPLE
221 diff -urN dxsamples-4.4.0.orig/programs/SUPERVISE/Makefile.am dxsamples-4.4.0/programs/SUPERVISE/Makefile.am
222 --- dxsamples-4.4.0.orig/programs/SUPERVISE/Makefile.am 2002-04-30 20:53:01.000000000 +0200
223 +++ dxsamples-4.4.0/programs/SUPERVISE/Makefile.am 2005-05-06 15:11:50.000000000 +0200
225 ## Process this file with automake to produce Makefile.in
227 -sampleprogdir = $(prefix)/dx/samples/programs/SUPERVISE
228 +sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/SUPERVISE
232 --- dxsamples-4.4.0/java/Makefile.am.orig 2006-02-04 11:59:32.000000000 +0100
233 +++ dxsamples-4.4.0/java/Makefile.am 2006-02-04 11:59:37.000000000 +0100
235 ## Process this file with automake to produce Makefile.in
237 -javasampdir = $(prefix)/dx/java/htmlpages
238 +javasampdir = $(prefix)/dx/samples/java/htmlpages
239 javasamp_DATA = $(WEB_FILES)
240 EXTRA_DIST = $(WEB_FILES)
242 --- dxsamples-4.4.0/java/nets/Makefile.am.orig 2006-02-04 12:34:45.000000000 +0100
243 +++ dxsamples-4.4.0/java/nets/Makefile.am 2006-02-04 12:34:55.000000000 +0100
245 -javanetsdir = $(prefix)/dx/java/server/nets
246 +javanetsdir = $(prefix)/dx/samples/java/server/nets
247 javanets_DATA = $(NET_FILES)
248 EXTRA_DIST = $(NET_FILES)
249 NET_FILES = AutoInsurance.cfg AutoInsurance.net \
250 --- dxsamples-4.4.0/java/userdata/Makefile.am.orig 2006-02-04 12:33:39.000000000 +0100
251 +++ dxsamples-4.4.0/java/userdata/Makefile.am 2006-02-04 12:33:56.000000000 +0100
253 -javadatadir = $(prefix)/dx/java/server/userdata
254 +javadatadir = $(prefix)/dx/samples/java/server/userdata
255 DATA_FILES = AutoInsurance.txt CCAll.dx Makefile.am Norm.dx apt.txt arf.txt asr.txt enhigh.cxn enhigh.txt enlow.cxn enlow.txt ibm94.txt ibm95.txt ibm96.txt mf1.txt npvcall.cm npvcall2.cm option.cm
256 javadata_DATA = $(DATA_FILES)
257 EXTRA_DIST = $(DATA_FILES)
258 --- dxsamples-4.4.0/java/usermacros/Makefile.am.orig 2006-02-04 12:39:29.000000000 +0100
259 +++ dxsamples-4.4.0/java/usermacros/Makefile.am 2006-02-04 12:39:35.000000000 +0100
261 -javamacrodir = $(prefix)/dx/java/server/usermacros
262 +javamacrodir = $(prefix)/dx/samples/java/server/usermacros
264 MACRO_FILES = ClassifyMacro.net Legend2Macro.net MOSFromLongLat.net \
265 bschols.net kmeansmacro.net logn.net optsurf.net \