--- festival-1.4.3.orig/config/modules/editline.mak
+++ festival-1.4.3/config/modules/editline.mak
@@ -43,10 +43,10 @@
 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
+#MODULE_LIBS  += $(TERMCAPLIB)
 
 ifeq ($(DIRNAME),siod)
     CSRCS := $(CSRCS) el_complete.c editline.c el_sys_unix.c
 endif
 
-
--- festival-1.4.3.orig/config/systems/default.mak
+++ festival-1.4.3/config/systems/default.mak
@@ -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
+
--- festival-1.4.3.orig/config/make_system.mak
+++ festival-1.4.3/config/make_system.mak
@@ -38,6 +38,10 @@
  ##                                                                       ##
  ###########################################################################
 
+MACHINETYPE=unknown
+OSTYPE=unknown
+include config
+
 system.mak : config
 	@echo Check system type >&2
 	@/bin/sh  $(TOP)/config/system.sh $(TOP)/config/systems > system.mak
--- festival-1.4.3.orig/config/project.mak
+++ festival-1.4.3/config/project.mak
@@ -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
 
--- festival-1.4.3.orig/config/config.in
+++ festival-1.4.3/config/config.in
@@ -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.
--- festival-1.4.3.orig/config/config
+++ festival-1.4.3/config/config
@@ -0,0 +1,75 @@
+########################################################-*-mode:Makefile-*-
+##                                                                       ##
+##  Festival: local configuration file                                   ##
+##                                                                       ##
+###########################################################################
+##
+##  Specific config file for local installation
+##
+
+###########################################################################
+## Which speech tools to use
+
+EST=/usr/lib/speech_tools
+
+###########################################################################
+## Where the festival tree will be installed.
+## 
+## The default is that festival will remain where it is compiled.
+##
+## You may need to set this explicitly if automounter or NFS
+## side effects cause problems
+
+FESTIVAL_HOME := $(shell (cd $(TOP); pwd))
+
+###########################################################################
+## Feature selection.
+##
+## Select modules to include.
+
+## Non Free PSOLA synthesis.  This isn't distributed with festival because
+## of a patent, if you have src/modules/diphone/di_psolaTM.cc you can
+## include this feature.
+# INCLUDE_PSOLA_TM=1
+
+##  Support for TCL. So that festival may eval TCL commands and TCL may eval
+## festival commands.  This was added to support the CSLU toolkit but
+## others may want it too.
+INCLUDE_TCL=1
+
+###########################################################################
+## Take most settings from speech tools.
+
+include $(EST)/config/config
+
+###########################################################################
+## Add any extra modules you wish to include
+
+## These sub modules are *optional* and unless you know what they are
+## you probabaly don't want them or need them.  They are typically
+## new code that isn't yet stable yet and being used for research or
+## old code left in for compatibility for some users  
+
+## Experimental UniSyn, metrical tree, phonological structure matching
+## code
+# ALSO_INCLUDE += UniSyn_phonology UniSyn_selection
+## Cluster unit selection code as described in "Building Voices in
+## Festival", again experimental and suitable for research purposes only.
+ALSO_INCLUDE += clunits
+## Old diphone code that will be delete, left in only for some
+## compatibility
+# ALSO_INCLUDE += diphone
+
+## Other (non-Edinburgh) modules may also be specified here (e.g. OGI code),
+
+ALSO_INCLUDE +=
+
+###########################################################################
+##
+## Describe your local system below by redefining things defined
+## in config/configs/default.mak.
+
+GCC_MAKE_SHARED_LIB = gcc -shared -o XXX
+SHARED = 2
+
+