diff -ruN festival./config/config.in festival/config/config.in
--- festival./config/config.in	Wed Apr  4 15:12:35 2001
+++ festival/config/config.in	Wed Jul 10 13:12:47 2002
@@ -10,7 +10,7 @@
 ###########################################################################
 ## Which speech tools to use
 
-EST=$(TOP)/../speech_tools
+EST=/usr/lib/speech_tools
 
 ###########################################################################
 ## Where the festival tree will be installed.
@@ -20,7 +20,7 @@
 ## You may need to set this explicitly if automounter or NFS
 ## side effects cause problems
 
-FESTIVAL_HOME := $(shell (cd $(TOP); pwd))
+FESTIVAL_HOME := /usr/share/festival
 
 ###########################################################################
 ## Feature selection.
diff -ruN festival./config/modules/editline.mak festival/config/modules/editline.mak
--- festival./config/modules/editline.mak	Wed Apr  4 13:55:20 2001
+++ festival/config/modules/editline.mak	Wed Jul 10 13:12:51 2002
@@ -43,7 +43,7 @@
 MOD_DESC_EDITLINE=Use editline for command line editing and history
 
 IO_DEFINES   += -DSUPPORT_EDITLINE $(MODULE_EDITLINE_OPTIONS:%=-DEDITLINE_%)
-MODULE_LIBS  += $(TERMCAPLIB)
+MODULE_LIBS  += -lncurses
 
 ifeq ($(DIRNAME),siod)
     CSRCS := $(CSRCS) el_complete.c editline.c el_sys_unix.c

diff -ruN festival./config/project.mak festival/config/project.mak
--- festival./config/project.mak	Fri Jul 20 13:21:54 2001
+++ festival/config/project.mak	Wed Jul 10 13:12:51 2002
@@ -70,8 +70,8 @@
 
 # Place where programs are compiled
 
-PROJECT_MAIN_DIR=$(FESTIVAL_HOME)/src/main
-PROJECT_SCRIPTS_DIR=$(FESTIVAL_HOME)/src/scripts
+PROJECT_MAIN_DIR=$(TOP)/src/main
+PROJECT_SCRIPTS_DIR=$(TOP)/src/scripts
 
 # Where the main RCS tree is, probably only used within CSTR
 
@@ -86,9 +86,9 @@
 # Libraries used from other projects
 
 REQUIRED_LIBRARIES = estools estbase eststring
-REQUIRED_LIBRARY_DIR_estools = $(EST)/lib
-REQUIRED_LIBRARY_DIR_estbase = $(EST)/lib
-REQUIRED_LIBRARY_DIR_eststring = $(EST)/lib
+REQUIRED_LIBRARY_DIR_estools = /usr/lib
+REQUIRED_LIBRARY_DIR_estbase = /usr/lib
+REQUIRED_LIBRARY_DIR_eststring = /usr/lib
 
 REQUIRED_MAKE_INCLUDE = $(EST)/make.include
 
diff -ruN festival./config/systems/default.mak festival/config/systems/default.mak
--- festival./config/systems/default.mak	Wed Apr  4 13:55:32 2001
+++ festival/config/systems/default.mak	Wed Jul 10 13:12:51 2002
@@ -142,3 +142,6 @@
 JAVA_COMPILER_VERSION_COMMAND=true
 
 JAVA_SYSTEM_INCLUDES  = -I$(JAVA_HOME)/include/genunix
+
+GCC_MAKE_SHARED_LIB = gcc -shared -o XXX
+
diff -ruN festival./doc/Makefile festival/doc/Makefile
--- festival./doc/Makefile	Wed Apr  4 13:55:21 2001
+++ festival/doc/Makefile	Wed Jul 10 13:12:47 2002
@@ -44,7 +44,7 @@
 
 EXAMPLE_TO_DOCUMENT=
 
-FESTIVAL=$(TOP)/bin/festival --libdir $(TOP)/lib
+FESTIVAL=$(TOP)/src/main/festival --libdir $(TOP)/lib
 
 # Include some of EST documentation.
 DOCXX_EXTRA_FILES = 
@@ -72,9 +72,9 @@
 %.1 : %.head %.options %.tail 
 	cat $^ >$@
 %.options : $(TOP)/src/main/%
-	$(TOP)/bin/$* -man_options >$@
+	$(TOP)/src/main/$* -man_options >$@
 %.options : $(TOP)/src/main/%.exe
-	$(TOP)/bin/$* -man_options >$@
+	$(TOP)/src/main/$* -man_options >$@
 
 festival.info: festival.texi festfunc.texi festvars.texi festfeat.texi
 	@ if [ ! -d info ] ; \
diff -ruN festival./examples/Makefile festival/examples/Makefile
--- festival./examples/Makefile	Wed Apr  4 15:12:35 2001
+++ festival/examples/Makefile	Wed Jul 10 13:12:47 2002
@@ -52,7 +52,7 @@
 $(ALL) : % : %.sh
 	rm -f $@
 	@echo "#!/bin/sh" >$@
-	@echo "\"true\" ; exec "$(FESTIVAL_HOME)/bin/festival --script '$$0 $$*' >>$@
+	@echo "\"true\" ; exec "/usr/bin/festival --script '$$0 $$*' >>$@
 	cat $< >>$@
 	chmod +x $@
 
diff -ruN festival./lib/Makefile festival/lib/Makefile
--- festival./lib/Makefile	Mon Jun  4 00:56:20 2001
+++ festival/lib/Makefile	Wed Jul 10 13:13:33 2002
@@ -73,8 +73,8 @@
 .copy_from_est: $(SIOD)
 	@:
 
-$(SIOD) : % : $(EST)/lib/siod/%
-	@echo 'Copy $* from EST/lib/siod'
+$(SIOD) : % : $(EST)/siod/%
+	@echo 'Copy $* from EST/siod'
 	@$(RM) -f $*
 	@{ \
 	echo '' ;\
@@ -84,7 +84,7 @@
 	echo ' ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;' ;\
 	echo ' ;;; DO NOT EDIT THIS FILE ON PAIN OF MORE PAIN.' ;\
 	echo ' ;;; ' ;\
-	echo ' ;;; The master copy of this file is in $(EST)/lib/siod/$*' ;\
+	echo ' ;;; The master copy of this file is in $(EST)/siod/$*' ;\
 	echo ' ;;; and is copied here at build time.' ;\
 	echo ' ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;' ;\
 	echo '' ;\
@@ -99,6 +99,6 @@
 	echo '' ;\
 	echo '' ;\
 	echo '' ;\
-	} | cat - $(EST)/lib/siod/$* |sed -e '/mode: *scheme/s//mode: view/' > $*
+	} | cat - $(EST)/siod/$* |sed -e '/mode: *scheme/s//mode: view/' > $*
 	@chmod a-w $*
 
diff -ruN festival./lib/voices.scm festival/lib/voices.scm
--- festival./lib/voices.scm	Wed Apr  4 15:12:35 2001
+++ festival/lib/voices.scm	Wed Jul 10 13:12:47 2002
@@ -42,7 +42,7 @@
 ;; The path to search for voices is created from the load-path with
 ;; an extra list of directories appended.
 
-(defvar system-voice-path '( )
+(defvar system-voice-path '("/usr/share/festival/lib/voices-1.4/" )
   "system-voice-path
    Additional directory not near the load path where voices can be
    found, this can be redefined in lib/sitevars.scm if desired.")