This patch is part of a series of patches for speech-tools for
Debian GNU/Linux, which primarily fix build errors with GCC 4.3 and newer.

--- speech-tools-1.2.3.orig/main/siod_main.cc
+++ speech-tools-1.2.3/main/siod_main.cc
@@ -180,7 +180,7 @@
     EST_Pathname initfile;
 
     // Load library init first
-    initfile = EST_Pathname(est_libdir).as_directory();
+    initfile = EST_Pathname(est_datadir).as_directory();
     initfile += "siod";
     initfile += "init.scm";
 
@@ -199,9 +199,12 @@
 
     lib = EST_Pathname(est_libdir).as_directory();
     lib += "siod";
-    
     siod_set_lval("libdir",strintern(lib));
 
+    lib = EST_Pathname(est_datadir).as_directory();
+    lib += "siod";
+    siod_set_lval("datadir",strintern(lib));
+
     if (!strcmp(est_ostype,""))
       siod_set_lval("*ostype*",rintern(est_ostype));
     siod_set_lval("est_version",
@@ -223,19 +226,10 @@
 		       cons(flocons(minor),
 			    cons(flocons(subminor),NIL))));
 
-    EST_Pathname etcdircommon = est_libdir;
-    etcdircommon += "etc";
-
-    EST_Pathname etcdir = etcdircommon;
-    etcdir += est_ostype;
-    
     //  Modify my PATH to include these directories
-    siod_set_lval("etc-path",cons(rintern(etcdir),
-				  cons(rintern(etcdircommon),NIL)));
-
     EST_String path = getenv("PATH");
 
-    path += ":" + EST_String(etcdir) + ":" +  EST_String(etcdircommon);
+    path += ":" + EST_String(est_libdir);
 
     putenv(wstrdup("PATH=" + path));