6a1fcdf
--- festival/src/scripts/festival_server.sh.foo	2003-08-25 23:47:26.000000000 -0400
6a1fcdf
+++ festival/src/scripts/festival_server.sh	2003-08-25 23:48:36.000000000 -0400
6a1fcdf
@@ -36,11 +36,6 @@
6a1fcdf
 #                                                                         #
6a1fcdf
 ###########################################################################
6a1fcdf
 
6a1fcdf
-TOP=__TOP__
6a1fcdf
-EST=__EST__
6a1fcdf
-
6a1fcdf
-#__SHARED_SETUP__
6a1fcdf
-
6a1fcdf
 useage()
6a1fcdf
 {
6a1fcdf
 cat <
6a1fcdf
--- festival/src/scripts/festival_server_control.sh.foo	2003-08-25 23:48:47.000000000 -0400
6a1fcdf
+++ festival/src/scripts/festival_server_control.sh	2003-08-25 23:48:59.000000000 -0400
6a1fcdf
@@ -36,11 +36,6 @@
6a1fcdf
 #                                                                         #
6a1fcdf
 ###########################################################################
6a1fcdf
 
6a1fcdf
-TOP=__TOP__
6a1fcdf
-EST=__EST__
6a1fcdf
-
6a1fcdf
-#__SHARED_SETUP__
6a1fcdf
-
6a1fcdf
 useage()
6a1fcdf
 {
6a1fcdf
 cat <
6a1fcdf
--- festival/examples/Makefile.foo	2003-08-25 23:50:06.000000000 -0400
6a1fcdf
+++ festival/examples/Makefile	2003-08-25 23:50:19.000000000 -0400
6a1fcdf
@@ -52,7 +52,7 @@
6a1fcdf
 $(ALL) : % : %.sh
6a1fcdf
 	rm -f $@
6a1fcdf
 	@echo "#!/bin/sh" >$@
6a1fcdf
-	@echo "\"true\" ; exec "$(FESTIVAL_HOME)/bin/festival --script '$$0 $$*' >>$@
6a1fcdf
+	@echo "\"true\" ; exec "/usr/bin/festival --script '$$0 $$*' >>$@
6a1fcdf
 	cat $< >>$@
6a1fcdf
 	chmod +x $@
6a1fcdf
 
6a1fcdf
--- festival/speech_tools/scripts/build_docbook_index.prl.foo	2003-08-25 23:37:59.000000000 -0400
6a1fcdf
+++ festival/speech_tools/scripts/build_docbook_index.prl	2003-08-25 23:38:54.000000000 -0400
6a1fcdf
@@ -35,8 +35,6 @@
6a1fcdf
 END
6a1fcdf
 }
6a1fcdf
 
6a1fcdf
-#__SHARED_SETUP__
6a1fcdf
-
6a1fcdf
 $title='';
6a1fcdf
 $mode='debug';
6a1fcdf
 $verbose=0;
6a1fcdf
--- festival/speech_tools/scripts/cxx_to_docbook.prl.foo	2003-08-25 23:38:58.000000000 -0400
6a1fcdf
+++ festival/speech_tools/scripts/cxx_to_docbook.prl	2003-08-25 23:39:02.000000000 -0400
6a1fcdf
@@ -37,8 +37,6 @@
6a1fcdf
 END
6a1fcdf
 }
6a1fcdf
 
6a1fcdf
-#__SHARED_SETUP__
6a1fcdf
-
6a1fcdf
 $level=0;
6a1fcdf
 $title=undef;
6a1fcdf
 $chapter='chapter';
6a1fcdf
--- festival/speech_tools/scripts/pm.prl.foo	2003-08-25 23:45:19.000000000 -0400
6a1fcdf
+++ festival/speech_tools/scripts/pm.prl	2003-08-25 23:45:28.000000000 -0400
6a1fcdf
@@ -56,8 +56,6 @@
6a1fcdf
 END
6a1fcdf
 }
6a1fcdf
 
6a1fcdf
-#__SHARED_SETUP__
6a1fcdf
-
6a1fcdf
 while ($#ARGV>=0)
6a1fcdf
     {
6a1fcdf
     if ($ARGV[0] eq "-f")
6a1fcdf
--- festival/speech_tools/scripts/raw_to_xgraph.prl.foo	2003-08-25 23:45:35.000000000 -0400
6a1fcdf
+++ festival/speech_tools/scripts/raw_to_xgraph.prl	2003-08-25 23:45:40.000000000 -0400
6a1fcdf
@@ -56,8 +56,6 @@
6a1fcdf
 END
6a1fcdf
 }
6a1fcdf
 
6a1fcdf
-#__SHARED_SETUP__
6a1fcdf
-
6a1fcdf
 $stream = STDIN;
6a1fcdf
 $sample_rate = 1;
6a1fcdf
 
6a1fcdf
--- festival/speech_tools/scripts/resynth.sh.foo	2003-08-25 23:45:48.000000000 -0400
6a1fcdf
+++ festival/speech_tools/scripts/resynth.sh	2003-08-25 23:45:57.000000000 -0400
6a1fcdf
@@ -63,8 +63,6 @@
6a1fcdf
     exit $1
6a1fcdf
 }
6a1fcdf
 
6a1fcdf
-#__SHARED_SETUP__
6a1fcdf
-
6a1fcdf
 invert=false
6a1fcdf
 voiced=''
6a1fcdf
 pre=0
6a1fcdf
--- festival/speech_tools/scripts/tex_to_images.prl.foo	2003-08-25 23:46:20.000000000 -0400
6a1fcdf
+++ festival/speech_tools/scripts/tex_to_images.prl	2003-08-25 23:46:41.000000000 -0400
6a1fcdf
@@ -79,8 +79,6 @@
6a1fcdf
     exit($_[0]);
6a1fcdf
 }
6a1fcdf
 
6a1fcdf
-#__SHARED_SETUP__
6a1fcdf
-
6a1fcdf
 $out_pattern="image_NNN.FFF";
6a1fcdf
 $scale=3;
6a1fcdf
 $over=2;