[packages/dx.git] / dxsamples-DESTDIR.patch

diff -urN dxsamples-4.3.2.orig/callmodule/Makefile.am dxsamples-4.3.2/callmodule/Makefile.am
--- dxsamples-4.3.2.orig/callmodule/Makefile.am	2003-06-19 07:02:52.000000000 +0200
+++ dxsamples-4.3.2/callmodule/Makefile.am	2005-05-06 15:13:22.000000000 +0200
@@ -7,7 +7,7 @@
 EXTRA_DIST = $(data_DATA)
 
 install-data-hook:
-	cp localmk $(datadir)/makefile
+	cp localmk $(DESTDIR)/$(datadir)/makefile
 
 uninstall-local:
 	rm $(datadir)/makefile
diff -urN dxsamples-4.3.2.orig/program_guide/Makefile.am dxsamples-4.3.2/program_guide/Makefile.am
--- dxsamples-4.3.2.orig/program_guide/Makefile.am	2003-06-19 07:09:12.000000000 +0200
+++ dxsamples-4.3.2/program_guide/Makefile.am	2005-05-06 15:13:26.000000000 +0200
@@ -19,7 +19,7 @@
 EXTRA_DIST = $(data_DATA) 
 
 install-data-hook:
-	cp localmk $(datadir)/makefile
+	cp localmk $(DESTDIR)/$(datadir)/makefile
 
 uninstall-local:
 	rm $(datadir)/makefile
diff -urN dxsamples-4.3.2.orig/programs/2D_DATA/Makefile.am dxsamples-4.3.2/programs/2D_DATA/Makefile.am
--- dxsamples-4.3.2.orig/programs/2D_DATA/Makefile.am	2002-04-30 20:53:26.000000000 +0200
+++ dxsamples-4.3.2/programs/2D_DATA/Makefile.am	2005-05-06 15:12:07.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-sampleprogdir = $(prefix)/dx/samples/programs/2D_DATA
+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/2D_DATA
 
 LINKLIST = \
          AlternateVisualizations.cfg\
diff -urN dxsamples-4.3.2.orig/programs/3D_DATA/Makefile.am dxsamples-4.3.2/programs/3D_DATA/Makefile.am
--- dxsamples-4.3.2.orig/programs/3D_DATA/Makefile.am	2002-04-30 20:53:26.000000000 +0200
+++ dxsamples-4.3.2/programs/3D_DATA/Makefile.am	2005-05-06 15:12:00.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-sampleprogdir = $(prefix)/dx/samples/programs/3D_DATA
+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/3D_DATA
 
 LINKLIST = \
          AnnotationGlyphs.cfg\
diff -urN dxsamples-4.3.2.orig/programs/ANNOTATION/Makefile.am dxsamples-4.3.2/programs/ANNOTATION/Makefile.am
--- dxsamples-4.3.2.orig/programs/ANNOTATION/Makefile.am	2002-04-30 20:53:25.000000000 +0200
+++ dxsamples-4.3.2/programs/ANNOTATION/Makefile.am	2005-05-06 15:11:35.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-sampleprogdir = $(prefix)/dx/samples/programs/ANNOTATION
+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/ANNOTATION
 
 LINKLIST = \
          AnnotationGlyphs.cfg\
diff -urN dxsamples-4.3.2.orig/programs/CATEGORICAL/Makefile.am dxsamples-4.3.2/programs/CATEGORICAL/Makefile.am
--- dxsamples-4.3.2.orig/programs/CATEGORICAL/Makefile.am	2002-04-30 20:53:24.000000000 +0200
+++ dxsamples-4.3.2/programs/CATEGORICAL/Makefile.am	2005-05-06 15:11:46.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-sampleprogdir = $(prefix)/dx/samples/programs/CATEGORICAL
+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/CATEGORICAL
 
 LINKLIST = \
          Categorical.cfg\
diff -urN dxsamples-4.3.2.orig/programs/COLORMAP_EDITOR/Makefile.am dxsamples-4.3.2/programs/COLORMAP_EDITOR/Makefile.am
--- dxsamples-4.3.2.orig/programs/COLORMAP_EDITOR/Makefile.am	2002-04-30 20:53:23.000000000 +0200
+++ dxsamples-4.3.2/programs/COLORMAP_EDITOR/Makefile.am	2005-05-06 15:12:04.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-sampleprogdir = $(prefix)/dx/samples/programs/COLORMAP_EDITOR
+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/COLORMAP_EDITOR
 
 LINKLIST = \
          DataDrivenInteractors.cfg\
diff -urN dxsamples-4.3.2.orig/programs/COMPUTE/Makefile.am dxsamples-4.3.2/programs/COMPUTE/Makefile.am
--- dxsamples-4.3.2.orig/programs/COMPUTE/Makefile.am	2002-04-30 20:53:23.000000000 +0200
+++ dxsamples-4.3.2/programs/COMPUTE/Makefile.am	2005-05-06 15:11:27.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-sampleprogdir = $(prefix)/dx/samples/programs/COMPUTE
+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/COMPUTE
 
 LINKLIST = \
          Bounce.cfg\
diff -urN dxsamples-4.3.2.orig/programs/DATA_DRIVEN_INTERACTORS/Makefile.am dxsamples-4.3.2/programs/DATA_DRIVEN_INTERACTORS/Makefile.am
--- dxsamples-4.3.2.orig/programs/DATA_DRIVEN_INTERACTORS/Makefile.am	2002-04-30 20:53:22.000000000 +0200
+++ dxsamples-4.3.2/programs/DATA_DRIVEN_INTERACTORS/Makefile.am	2005-05-06 15:11:39.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-sampleprogdir = $(prefix)/dx/samples/programs/DATA_DRIVEN_INTERACTORS
+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/DATA_DRIVEN_INTERACTORS
 
 LINKLIST = \
          DataDrivenInteractors.cfg\
diff -urN dxsamples-4.3.2.orig/programs/DEBUGGING/Makefile.am dxsamples-4.3.2/programs/DEBUGGING/Makefile.am
--- dxsamples-4.3.2.orig/programs/DEBUGGING/Makefile.am	2002-04-30 20:53:21.000000000 +0200
+++ dxsamples-4.3.2/programs/DEBUGGING/Makefile.am	2005-05-06 15:11:57.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-sampleprogdir = $(prefix)/dx/samples/programs/DEBUGGING
+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/DEBUGGING
 
 LINKLIST = \
          Verify.cfg\
diff -urN dxsamples-4.3.2.orig/programs/DISTRIBUTED_PROCESSING/Makefile.am dxsamples-4.3.2/programs/DISTRIBUTED_PROCESSING/Makefile.am
--- dxsamples-4.3.2.orig/programs/DISTRIBUTED_PROCESSING/Makefile.am	2002-04-30 20:53:20.000000000 +0200
+++ dxsamples-4.3.2/programs/DISTRIBUTED_PROCESSING/Makefile.am	2005-05-06 15:12:20.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-sampleprogdir = $(prefix)/dx/samples/programs/DISTRIBUTED_PROCESSING
+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/DISTRIBUTED_PROCESSING
 
 LINKLIST = \
          Distributed.cfg\
diff -urN dxsamples-4.3.2.orig/programs/IMAGE_PROCESSING/Makefile.am dxsamples-4.3.2/programs/IMAGE_PROCESSING/Makefile.am
--- dxsamples-4.3.2.orig/programs/IMAGE_PROCESSING/Makefile.am	2002-04-30 20:53:20.000000000 +0200
+++ dxsamples-4.3.2/programs/IMAGE_PROCESSING/Makefile.am	2005-05-06 15:12:10.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-sampleprogdir = $(prefix)/dx/samples/programs/IMAGE_PROCESSING
+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/IMAGE_PROCESSING
 
 LINKLIST = \
          FFT.cfg\
diff -urN dxsamples-4.3.2.orig/programs/IMPORTING/Makefile.am dxsamples-4.3.2/programs/IMPORTING/Makefile.am
--- dxsamples-4.3.2.orig/programs/IMPORTING/Makefile.am	2002-04-30 20:53:19.000000000 +0200
+++ dxsamples-4.3.2/programs/IMPORTING/Makefile.am	2005-05-06 15:12:32.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-sampleprogdir = $(prefix)/dx/samples/programs/IMPORTING
+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/IMPORTING
 
 LINKLIST = \
          Categorical.cfg\
diff -urN dxsamples-4.3.2.orig/programs/INTERFACE_CONTROL/Makefile.am dxsamples-4.3.2/programs/INTERFACE_CONTROL/Makefile.am
--- dxsamples-4.3.2.orig/programs/INTERFACE_CONTROL/Makefile.am	2002-04-30 20:53:18.000000000 +0200
+++ dxsamples-4.3.2/programs/INTERFACE_CONTROL/Makefile.am	2005-05-06 15:12:28.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-sampleprogdir = $(prefix)/dx/samples/programs/INTERFACE_CONTROL
+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/INTERFACE_CONTROL
 
 LINKLIST = \
          DialogStyle.cfg\
diff -urN dxsamples-4.3.2.orig/programs/LOOPING/Makefile.am dxsamples-4.3.2/programs/LOOPING/Makefile.am
--- dxsamples-4.3.2.orig/programs/LOOPING/Makefile.am	2002-04-30 20:53:17.000000000 +0200
+++ dxsamples-4.3.2/programs/LOOPING/Makefile.am	2005-05-06 15:12:17.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-sampleprogdir = $(prefix)/dx/samples/programs/LOOPING
+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/LOOPING
 
 LINKLIST = \
          Accumulate.cfg\
diff -urN dxsamples-4.3.2.orig/programs/MISC/Makefile.am dxsamples-4.3.2/programs/MISC/Makefile.am
--- dxsamples-4.3.2.orig/programs/MISC/Makefile.am	2002-04-30 20:53:13.000000000 +0200
+++ dxsamples-4.3.2/programs/MISC/Makefile.am	2005-05-06 15:12:38.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-sampleprogdir = $(prefix)/dx/samples/programs/MISC
+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/MISC
 
 LINKLIST = \
          CensusData.cfg\
diff -urN dxsamples-4.3.2.orig/programs/PLOTTING/Makefile.am dxsamples-4.3.2/programs/PLOTTING/Makefile.am
--- dxsamples-4.3.2.orig/programs/PLOTTING/Makefile.am	2002-04-30 20:53:12.000000000 +0200
+++ dxsamples-4.3.2/programs/PLOTTING/Makefile.am	2005-05-06 15:11:54.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-sampleprogdir = $(prefix)/dx/samples/programs/PLOTTING
+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/PLOTTING
 
 LINKLIST = \
          Categorical.cfg\
diff -urN dxsamples-4.3.2.orig/programs/PROBES/Makefile.am dxsamples-4.3.2/programs/PROBES/Makefile.am
--- dxsamples-4.3.2.orig/programs/PROBES/Makefile.am	2002-04-30 20:53:11.000000000 +0200
+++ dxsamples-4.3.2/programs/PROBES/Makefile.am	2005-05-06 15:12:25.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-sampleprogdir = $(prefix)/dx/samples/programs/PROBES
+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/PROBES
 
 LINKLIST = \
          PlotLine2.cfg\
diff -urN dxsamples-4.3.2.orig/programs/RENDERING/Makefile.am dxsamples-4.3.2/programs/RENDERING/Makefile.am
--- dxsamples-4.3.2.orig/programs/RENDERING/Makefile.am	2002-04-30 20:53:10.000000000 +0200
+++ dxsamples-4.3.2/programs/RENDERING/Makefile.am	2005-05-06 15:12:35.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-sampleprogdir = $(prefix)/dx/samples/programs/RENDERING
+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/RENDERING
 
 LINKLIST = \
          FatLines.cfg\
diff -urN dxsamples-4.3.2.orig/programs/SCATTERED/Makefile.am dxsamples-4.3.2/programs/SCATTERED/Makefile.am
--- dxsamples-4.3.2.orig/programs/SCATTERED/Makefile.am	2002-04-30 20:53:08.000000000 +0200
+++ dxsamples-4.3.2/programs/SCATTERED/Makefile.am	2005-05-06 15:11:43.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-sampleprogdir = $(prefix)/dx/samples/programs/SCATTERED
+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/SCATTERED
 
 LINKLIST = \
          AnnotationGlyphs.cfg\
diff -urN dxsamples-4.3.2.orig/programs/SEQUENCER/Makefile.am dxsamples-4.3.2/programs/SEQUENCER/Makefile.am
--- dxsamples-4.3.2.orig/programs/SEQUENCER/Makefile.am	2002-04-30 20:53:07.000000000 +0200
+++ dxsamples-4.3.2/programs/SEQUENCER/Makefile.am	2005-05-06 15:12:12.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-sampleprogdir = $(prefix)/dx/samples/programs/SEQUENCER
+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/SEQUENCER
 
 LINKLIST = \
          ContoursAndCaption.cfg\
diff -urN dxsamples-4.3.2.orig/programs/SIMPLE/Makefile.am dxsamples-4.3.2/programs/SIMPLE/Makefile.am
--- dxsamples-4.3.2.orig/programs/SIMPLE/Makefile.am	2002-04-30 20:53:06.000000000 +0200
+++ dxsamples-4.3.2/programs/SIMPLE/Makefile.am	2005-05-06 15:12:22.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-sampleprogdir = $(prefix)/dx/samples/programs/SIMPLE
+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/SIMPLE
 
 LINKLIST = \
          Arrange.cfg\
diff -urN dxsamples-4.3.2.orig/programs/SUPERVISE/Makefile.am dxsamples-4.3.2/programs/SUPERVISE/Makefile.am
--- dxsamples-4.3.2.orig/programs/SUPERVISE/Makefile.am	2002-04-30 20:53:01.000000000 +0200
+++ dxsamples-4.3.2/programs/SUPERVISE/Makefile.am	2005-05-06 15:11:50.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-sampleprogdir = $(prefix)/dx/samples/programs/SUPERVISE
+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/SUPERVISE
 
 LINKLIST = \
          Image_wo_UI.cfg\
diff -urN dxsamples-4.3.2.orig/stereo/src/Makefile.am dxsamples-4.3.2/stereo/src/Makefile.am
--- dxsamples-4.3.2.orig/stereo/src/Makefile.am	2002-04-01 04:28:51.000000000 +0200
+++ dxsamples-4.3.2/stereo/src/Makefile.am	2005-05-06 15:13:32.000000000 +0200
@@ -7,7 +7,7 @@
 EXTRA_DIST = $(data_DATA) 
 
 install-data-hook:
-	cp localmk $(datadir)/makefile
+	cp localmk $(DESTDIR)/$(datadir)/makefile
 
 uninstall-local:
 	rm $(datadir)/makefile
--- dxsamples-4.3.2/java/Makefile.am.orig	2006-02-04 11:59:32.000000000 +0100
+++ dxsamples-4.3.2/java/Makefile.am	2006-02-04 11:59:37.000000000 +0100
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
  
-javasampdir = $(prefix)/dx/java/htmlpages
+javasampdir = $(prefix)/dx/samples/java/htmlpages
 javasamp_DATA = $(WEB_FILES)
 EXTRA_DIST = $(WEB_FILES)
  
--- dxsamples-4.3.2/java/nets/Makefile.am.orig	2006-02-04 12:34:45.000000000 +0100
+++ dxsamples-4.3.2/java/nets/Makefile.am	2006-02-04 12:34:55.000000000 +0100
@@ -1,4 +1,4 @@
-javanetsdir = $(prefix)/dx/java/server/nets
+javanetsdir = $(prefix)/dx/samples/java/server/nets
 javanets_DATA = $(NET_FILES)
 EXTRA_DIST = $(NET_FILES)
 NET_FILES = AutoInsurance.cfg AutoInsurance.net \
--- dxsamples-4.3.2/java/userdata/Makefile.am.orig	2006-02-04 12:33:39.000000000 +0100
+++ dxsamples-4.3.2/java/userdata/Makefile.am	2006-02-04 12:33:56.000000000 +0100
@@ -1,4 +1,4 @@
-javadatadir = $(prefix)/dx/java/server/userdata
+javadatadir = $(prefix)/dx/samples/java/server/userdata
 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
 javadata_DATA = $(DATA_FILES)
 EXTRA_DIST = $(DATA_FILES)
--- dxsamples-4.3.2/java/usermacros/Makefile.am.orig	2006-02-04 12:39:29.000000000 +0100
+++ dxsamples-4.3.2/java/usermacros/Makefile.am	2006-02-04 12:39:35.000000000 +0100
@@ -1,4 +1,4 @@
-javamacrodir = $(prefix)/dx/java/server/usermacros
+javamacrodir = $(prefix)/dx/samples/java/server/usermacros
 
 MACRO_FILES = ClassifyMacro.net Legend2Macro.net MOSFromLongLat.net \
 	bschols.net kmeansmacro.net logn.net optsurf.net \
Commit	Line	Data
d4607565 TP	1	diff -urN dxsamples-4.3.2.orig/callmodule/Makefile.am dxsamples-4.3.2/callmodule/Makefile.am
	2	--- dxsamples-4.3.2.orig/callmodule/Makefile.am 2003-06-19 07:02:52.000000000 +0200
	3	+++ dxsamples-4.3.2/callmodule/Makefile.am 2005-05-06 15:13:22.000000000 +0200
	4	@@ -7,7 +7,7 @@
	5	EXTRA_DIST = $(data_DATA)
	6
	7	install-data-hook:
	8	- cp localmk $(datadir)/makefile
	9	+ cp localmk $(DESTDIR)/$(datadir)/makefile
	10
	11	uninstall-local:
	12	rm $(datadir)/makefile
	13	diff -urN dxsamples-4.3.2.orig/program_guide/Makefile.am dxsamples-4.3.2/program_guide/Makefile.am
	14	--- dxsamples-4.3.2.orig/program_guide/Makefile.am 2003-06-19 07:09:12.000000000 +0200
	15	+++ dxsamples-4.3.2/program_guide/Makefile.am 2005-05-06 15:13:26.000000000 +0200
	16	@@ -19,7 +19,7 @@
	17	EXTRA_DIST = $(data_DATA)
	18
	19	install-data-hook:
	20	- cp localmk $(datadir)/makefile
	21	+ cp localmk $(DESTDIR)/$(datadir)/makefile
	22
	23	uninstall-local:
	24	rm $(datadir)/makefile
	25	diff -urN dxsamples-4.3.2.orig/programs/2D_DATA/Makefile.am dxsamples-4.3.2/programs/2D_DATA/Makefile.am
	26	--- dxsamples-4.3.2.orig/programs/2D_DATA/Makefile.am 2002-04-30 20:53:26.000000000 +0200
	27	+++ dxsamples-4.3.2/programs/2D_DATA/Makefile.am 2005-05-06 15:12:07.000000000 +0200
	28	@@ -1,6 +1,6 @@
	29	## Process this file with automake to produce Makefile.in
	30
	31	-sampleprogdir = $(prefix)/dx/samples/programs/2D_DATA
	32	+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/2D_DATA
	33
	34	LINKLIST = \
	35	AlternateVisualizations.cfg\
	36	diff -urN dxsamples-4.3.2.orig/programs/3D_DATA/Makefile.am dxsamples-4.3.2/programs/3D_DATA/Makefile.am
	37	--- dxsamples-4.3.2.orig/programs/3D_DATA/Makefile.am 2002-04-30 20:53:26.000000000 +0200
	38	+++ dxsamples-4.3.2/programs/3D_DATA/Makefile.am 2005-05-06 15:12:00.000000000 +0200
	39	@@ -1,6 +1,6 @@
	40	## Process this file with automake to produce Makefile.in
	41
	42	-sampleprogdir = $(prefix)/dx/samples/programs/3D_DATA
	43	+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/3D_DATA
	44
	45	LINKLIST = \
	46	AnnotationGlyphs.cfg\
	47	diff -urN dxsamples-4.3.2.orig/programs/ANNOTATION/Makefile.am dxsamples-4.3.2/programs/ANNOTATION/Makefile.am
	48	--- dxsamples-4.3.2.orig/programs/ANNOTATION/Makefile.am 2002-04-30 20:53:25.000000000 +0200
	49	+++ dxsamples-4.3.2/programs/ANNOTATION/Makefile.am 2005-05-06 15:11:35.000000000 +0200
	50	@@ -1,6 +1,6 @@
	51	## Process this file with automake to produce Makefile.in
	52
	53	-sampleprogdir = $(prefix)/dx/samples/programs/ANNOTATION
	54	+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/ANNOTATION
	55
	56	LINKLIST = \
	57	AnnotationGlyphs.cfg\
	58	diff -urN dxsamples-4.3.2.orig/programs/CATEGORICAL/Makefile.am dxsamples-4.3.2/programs/CATEGORICAL/Makefile.am
	59	--- dxsamples-4.3.2.orig/programs/CATEGORICAL/Makefile.am 2002-04-30 20:53:24.000000000 +0200
	60	+++ dxsamples-4.3.2/programs/CATEGORICAL/Makefile.am 2005-05-06 15:11:46.000000000 +0200
	61	@@ -1,6 +1,6 @@
	62	## Process this file with automake to produce Makefile.in
	63
	64	-sampleprogdir = $(prefix)/dx/samples/programs/CATEGORICAL
65	+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/CATEGORICAL
66
67	LINKLIST = \
68	Categorical.cfg\
69	diff -urN dxsamples-4.3.2.orig/programs/COLORMAP_EDITOR/Makefile.am dxsamples-4.3.2/programs/COLORMAP_EDITOR/Makefile.am
70	--- dxsamples-4.3.2.orig/programs/COLORMAP_EDITOR/Makefile.am 2002-04-30 20:53:23.000000000 +0200
71	+++ dxsamples-4.3.2/programs/COLORMAP_EDITOR/Makefile.am 2005-05-06 15:12:04.000000000 +0200
72	@@ -1,6 +1,6 @@
73	## Process this file with automake to produce Makefile.in
74
75	-sampleprogdir = $(prefix)/dx/samples/programs/COLORMAP_EDITOR
76	+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/COLORMAP_EDITOR
77
78	LINKLIST = \
79	DataDrivenInteractors.cfg\
80	diff -urN dxsamples-4.3.2.orig/programs/COMPUTE/Makefile.am dxsamples-4.3.2/programs/COMPUTE/Makefile.am
81	--- dxsamples-4.3.2.orig/programs/COMPUTE/Makefile.am 2002-04-30 20:53:23.000000000 +0200
82	+++ dxsamples-4.3.2/programs/COMPUTE/Makefile.am 2005-05-06 15:11:27.000000000 +0200
83	@@ -1,6 +1,6 @@
84	## Process this file with automake to produce Makefile.in
85
86	-sampleprogdir = $(prefix)/dx/samples/programs/COMPUTE
87	+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/COMPUTE
88
89	LINKLIST = \
90	Bounce.cfg\
91	diff -urN dxsamples-4.3.2.orig/programs/DATA_DRIVEN_INTERACTORS/Makefile.am dxsamples-4.3.2/programs/DATA_DRIVEN_INTERACTORS/Makefile.am
92	--- dxsamples-4.3.2.orig/programs/DATA_DRIVEN_INTERACTORS/Makefile.am 2002-04-30 20:53:22.000000000 +0200
93	+++ dxsamples-4.3.2/programs/DATA_DRIVEN_INTERACTORS/Makefile.am 2005-05-06 15:11:39.000000000 +0200
94	@@ -1,6 +1,6 @@
95	## Process this file with automake to produce Makefile.in
96
97	-sampleprogdir = $(prefix)/dx/samples/programs/DATA_DRIVEN_INTERACTORS
98	+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/DATA_DRIVEN_INTERACTORS
99
100	LINKLIST = \
101	DataDrivenInteractors.cfg\
102	diff -urN dxsamples-4.3.2.orig/programs/DEBUGGING/Makefile.am dxsamples-4.3.2/programs/DEBUGGING/Makefile.am
103	--- dxsamples-4.3.2.orig/programs/DEBUGGING/Makefile.am 2002-04-30 20:53:21.000000000 +0200
104	+++ dxsamples-4.3.2/programs/DEBUGGING/Makefile.am 2005-05-06 15:11:57.000000000 +0200
105	@@ -1,6 +1,6 @@
106	## Process this file with automake to produce Makefile.in
107
108	-sampleprogdir = $(prefix)/dx/samples/programs/DEBUGGING
109	+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/DEBUGGING
110
111	LINKLIST = \
112	Verify.cfg\
113	diff -urN dxsamples-4.3.2.orig/programs/DISTRIBUTED_PROCESSING/Makefile.am dxsamples-4.3.2/programs/DISTRIBUTED_PROCESSING/Makefile.am
114	--- dxsamples-4.3.2.orig/programs/DISTRIBUTED_PROCESSING/Makefile.am 2002-04-30 20:53:20.000000000 +0200
115	+++ dxsamples-4.3.2/programs/DISTRIBUTED_PROCESSING/Makefile.am 2005-05-06 15:12:20.000000000 +0200
116	@@ -1,6 +1,6 @@
117	## Process this file with automake to produce Makefile.in
118
119	-sampleprogdir = $(prefix)/dx/samples/programs/DISTRIBUTED_PROCESSING
120	+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/DISTRIBUTED_PROCESSING
121
122	LINKLIST = \
123	Distributed.cfg\
124	diff -urN dxsamples-4.3.2.orig/programs/IMAGE_PROCESSING/Makefile.am dxsamples-4.3.2/programs/IMAGE_PROCESSING/Makefile.am
125	--- dxsamples-4.3.2.orig/programs/IMAGE_PROCESSING/Makefile.am 2002-04-30 20:53:20.000000000 +0200
126	+++ dxsamples-4.3.2/programs/IMAGE_PROCESSING/Makefile.am 2005-05-06 15:12:10.000000000 +0200
127	@@ -1,6 +1,6 @@
128	## Process this file with automake to produce Makefile.in
129
130	-sampleprogdir = $(prefix)/dx/samples/programs/IMAGE_PROCESSING
131	+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/IMAGE_PROCESSING
132
133	LINKLIST = \
134	FFT.cfg\
135	diff -urN dxsamples-4.3.2.orig/programs/IMPORTING/Makefile.am dxsamples-4.3.2/programs/IMPORTING/Makefile.am
136	--- dxsamples-4.3.2.orig/programs/IMPORTING/Makefile.am 2002-04-30 20:53:19.000000000 +0200
137	+++ dxsamples-4.3.2/programs/IMPORTING/Makefile.am 2005-05-06 15:12:32.000000000 +0200
138	@@ -1,6 +1,6 @@
139	## Process this file with automake to produce Makefile.in
140
141	-sampleprogdir = $(prefix)/dx/samples/programs/IMPORTING
142	+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/IMPORTING
143
144	LINKLIST = \
145	Categorical.cfg\
146	diff -urN dxsamples-4.3.2.orig/programs/INTERFACE_CONTROL/Makefile.am dxsamples-4.3.2/programs/INTERFACE_CONTROL/Makefile.am
147	--- dxsamples-4.3.2.orig/programs/INTERFACE_CONTROL/Makefile.am 2002-04-30 20:53:18.000000000 +0200
148	+++ dxsamples-4.3.2/programs/INTERFACE_CONTROL/Makefile.am 2005-05-06 15:12:28.000000000 +0200
149	@@ -1,6 +1,6 @@
150	## Process this file with automake to produce Makefile.in
151
152	-sampleprogdir = $(prefix)/dx/samples/programs/INTERFACE_CONTROL
153	+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/INTERFACE_CONTROL
154
155	LINKLIST = \
156	DialogStyle.cfg\
157	diff -urN dxsamples-4.3.2.orig/programs/LOOPING/Makefile.am dxsamples-4.3.2/programs/LOOPING/Makefile.am
158	--- dxsamples-4.3.2.orig/programs/LOOPING/Makefile.am 2002-04-30 20:53:17.000000000 +0200
159	+++ dxsamples-4.3.2/programs/LOOPING/Makefile.am 2005-05-06 15:12:17.000000000 +0200
160	@@ -1,6 +1,6 @@
161	## Process this file with automake to produce Makefile.in
162
163	-sampleprogdir = $(prefix)/dx/samples/programs/LOOPING
164	+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/LOOPING
165
166	LINKLIST = \
167	Accumulate.cfg\
168	diff -urN dxsamples-4.3.2.orig/programs/MISC/Makefile.am dxsamples-4.3.2/programs/MISC/Makefile.am
169	--- dxsamples-4.3.2.orig/programs/MISC/Makefile.am 2002-04-30 20:53:13.000000000 +0200
170	+++ dxsamples-4.3.2/programs/MISC/Makefile.am 2005-05-06 15:12:38.000000000 +0200
171	@@ -1,6 +1,6 @@
172	## Process this file with automake to produce Makefile.in
173
174	-sampleprogdir = $(prefix)/dx/samples/programs/MISC
175	+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/MISC
176
177	LINKLIST = \
178	CensusData.cfg\
179	diff -urN dxsamples-4.3.2.orig/programs/PLOTTING/Makefile.am dxsamples-4.3.2/programs/PLOTTING/Makefile.am
180	--- dxsamples-4.3.2.orig/programs/PLOTTING/Makefile.am 2002-04-30 20:53:12.000000000 +0200
181	+++ dxsamples-4.3.2/programs/PLOTTING/Makefile.am 2005-05-06 15:11:54.000000000 +0200
182	@@ -1,6 +1,6 @@
183	## Process this file with automake to produce Makefile.in
184
185	-sampleprogdir = $(prefix)/dx/samples/programs/PLOTTING
186	+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/PLOTTING
187
188	LINKLIST = \
189	Categorical.cfg\
190	diff -urN dxsamples-4.3.2.orig/programs/PROBES/Makefile.am dxsamples-4.3.2/programs/PROBES/Makefile.am
191	--- dxsamples-4.3.2.orig/programs/PROBES/Makefile.am 2002-04-30 20:53:11.000000000 +0200
192	+++ dxsamples-4.3.2/programs/PROBES/Makefile.am 2005-05-06 15:12:25.000000000 +0200
193	@@ -1,6 +1,6 @@
194	## Process this file with automake to produce Makefile.in
195
196	-sampleprogdir = $(prefix)/dx/samples/programs/PROBES
197	+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/PROBES
198
199	LINKLIST = \
200	PlotLine2.cfg\
201	diff -urN dxsamples-4.3.2.orig/programs/RENDERING/Makefile.am dxsamples-4.3.2/programs/RENDERING/Makefile.am
202	--- dxsamples-4.3.2.orig/programs/RENDERING/Makefile.am 2002-04-30 20:53:10.000000000 +0200
203	+++ dxsamples-4.3.2/programs/RENDERING/Makefile.am 2005-05-06 15:12:35.000000000 +0200
204	@@ -1,6 +1,6 @@
205	## Process this file with automake to produce Makefile.in
206
207	-sampleprogdir = $(prefix)/dx/samples/programs/RENDERING
208	+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/RENDERING
209
210	LINKLIST = \
211	FatLines.cfg\
212	diff -urN dxsamples-4.3.2.orig/programs/SCATTERED/Makefile.am dxsamples-4.3.2/programs/SCATTERED/Makefile.am
213	--- dxsamples-4.3.2.orig/programs/SCATTERED/Makefile.am 2002-04-30 20:53:08.000000000 +0200
214	+++ dxsamples-4.3.2/programs/SCATTERED/Makefile.am 2005-05-06 15:11:43.000000000 +0200
215	@@ -1,6 +1,6 @@
216	## Process this file with automake to produce Makefile.in
217
218	-sampleprogdir = $(prefix)/dx/samples/programs/SCATTERED
219	+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/SCATTERED
220
221	LINKLIST = \
222	AnnotationGlyphs.cfg\
223	diff -urN dxsamples-4.3.2.orig/programs/SEQUENCER/Makefile.am dxsamples-4.3.2/programs/SEQUENCER/Makefile.am
224	--- dxsamples-4.3.2.orig/programs/SEQUENCER/Makefile.am 2002-04-30 20:53:07.000000000 +0200
225	+++ dxsamples-4.3.2/programs/SEQUENCER/Makefile.am 2005-05-06 15:12:12.000000000 +0200
226	@@ -1,6 +1,6 @@
227	## Process this file with automake to produce Makefile.in
228
229	-sampleprogdir = $(prefix)/dx/samples/programs/SEQUENCER
230	+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/SEQUENCER
231
232	LINKLIST = \
233	ContoursAndCaption.cfg\
234	diff -urN dxsamples-4.3.2.orig/programs/SIMPLE/Makefile.am dxsamples-4.3.2/programs/SIMPLE/Makefile.am
235	--- dxsamples-4.3.2.orig/programs/SIMPLE/Makefile.am 2002-04-30 20:53:06.000000000 +0200
236	+++ dxsamples-4.3.2/programs/SIMPLE/Makefile.am 2005-05-06 15:12:22.000000000 +0200
237	@@ -1,6 +1,6 @@
238	## Process this file with automake to produce Makefile.in
239
240	-sampleprogdir = $(prefix)/dx/samples/programs/SIMPLE
241	+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/SIMPLE
242
243	LINKLIST = \
244	Arrange.cfg\
245	diff -urN dxsamples-4.3.2.orig/programs/SUPERVISE/Makefile.am dxsamples-4.3.2/programs/SUPERVISE/Makefile.am
246	--- dxsamples-4.3.2.orig/programs/SUPERVISE/Makefile.am 2002-04-30 20:53:01.000000000 +0200
247	+++ dxsamples-4.3.2/programs/SUPERVISE/Makefile.am 2005-05-06 15:11:50.000000000 +0200
248	@@ -1,6 +1,6 @@
249	## Process this file with automake to produce Makefile.in
250
251	-sampleprogdir = $(prefix)/dx/samples/programs/SUPERVISE
252	+sampleprogdir = $(DESTDIR)/$(prefix)/dx/samples/programs/SUPERVISE
253
254	LINKLIST = \
255	Image_wo_UI.cfg\
256	diff -urN dxsamples-4.3.2.orig/stereo/src/Makefile.am dxsamples-4.3.2/stereo/src/Makefile.am
257	--- dxsamples-4.3.2.orig/stereo/src/Makefile.am 2002-04-01 04:28:51.000000000 +0200
258	+++ dxsamples-4.3.2/stereo/src/Makefile.am 2005-05-06 15:13:32.000000000 +0200
259	@@ -7,7 +7,7 @@
260	EXTRA_DIST = $(data_DATA)
261
262	install-data-hook:
263	- cp localmk $(datadir)/makefile
264	+ cp localmk $(DESTDIR)/$(datadir)/makefile
265
266	uninstall-local:
267	rm $(datadir)/makefile
5a4d0763	268	--- dxsamples-4.3.2/java/Makefile.am.orig 2006-02-04 11:59:32.000000000 +0100
	269	+++ dxsamples-4.3.2/java/Makefile.am 2006-02-04 11:59:37.000000000 +0100
	270	@@ -1,6 +1,6 @@
	271	## Process this file with automake to produce Makefile.in
	272
	273	-javasampdir = $(prefix)/dx/java/htmlpages
	274	+javasampdir = $(prefix)/dx/samples/java/htmlpages
	275	javasamp_DATA = $(WEB_FILES)
	276	EXTRA_DIST = $(WEB_FILES)
	277
	278	--- dxsamples-4.3.2/java/nets/Makefile.am.orig 2006-02-04 12:34:45.000000000 +0100
	279	+++ dxsamples-4.3.2/java/nets/Makefile.am 2006-02-04 12:34:55.000000000 +0100
	280	@@ -1,4 +1,4 @@
	281	-javanetsdir = $(prefix)/dx/java/server/nets
	282	+javanetsdir = $(prefix)/dx/samples/java/server/nets
	283	javanets_DATA = $(NET_FILES)
	284	EXTRA_DIST = $(NET_FILES)
	285	NET_FILES = AutoInsurance.cfg AutoInsurance.net \
	286	--- dxsamples-4.3.2/java/userdata/Makefile.am.orig 2006-02-04 12:33:39.000000000 +0100
	287	+++ dxsamples-4.3.2/java/userdata/Makefile.am 2006-02-04 12:33:56.000000000 +0100
	288	@@ -1,4 +1,4 @@
	289	-javadatadir = $(prefix)/dx/java/server/userdata
	290	+javadatadir = $(prefix)/dx/samples/java/server/userdata
	291	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
	292	javadata_DATA = $(DATA_FILES)
	293	EXTRA_DIST = $(DATA_FILES)
	294	--- dxsamples-4.3.2/java/usermacros/Makefile.am.orig 2006-02-04 12:39:29.000000000 +0100
	295	+++ dxsamples-4.3.2/java/usermacros/Makefile.am 2006-02-04 12:39:35.000000000 +0100
	296	@@ -1,4 +1,4 @@
	297	-javamacrodir = $(prefix)/dx/java/server/usermacros
	298	+javamacrodir = $(prefix)/dx/samples/java/server/usermacros
	299
	300	MACRO_FILES = ClassifyMacro.net Legend2Macro.net MOSFromLongLat.net \
	301	bschols.net kmeansmacro.net logn.net optsurf.net \