diff -ur festival/config/config.in festival.new/config/config.in
--- festival/config/config.in 2001-04-04 15:12:35.000000000 +0200
+++ festival.new/config/config.in 2003-02-13 21:21:00.000000000 +0200
@@ -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.
Only in festival.new/config/modules: editline.mak.orig
Only in festival.new/config/modules: editline.mak.rej
diff -ur festival/config/project.mak festival.new/config/project.mak
--- festival/config/project.mak 2003-01-25 02:15:34.000000000 +0200
+++ festival.new/config/project.mak 2003-02-13 21:21:00.000000000 +0200
@@ -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 -ur festival/config/systems/default.mak festival.new/config/systems/default.mak
--- festival/config/systems/default.mak 2001-04-04 13:55:32.000000000 +0200
+++ festival.new/config/systems/default.mak 2003-02-13 21:21:00.000000000 +0200
@@ -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 -ur festival/doc/Makefile festival.new/doc/Makefile
--- festival/doc/Makefile 2001-04-04 13:55:21.000000000 +0200
+++ festival.new/doc/Makefile 2003-02-13 21:21:00.000000000 +0200
@@ -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 -ur festival/examples/Makefile festival.new/examples/Makefile
--- festival/examples/Makefile 2003-01-15 14:42:32.000000000 +0200
+++ festival.new/examples/Makefile 2003-02-13 21:21:00.000000000 +0200
@@ -55,7 +55,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 $@
Only in festival.new/examples: Makefile.orig
Only in festival.new/: festdoc-1.4.2
diff -ur festival/lib/Makefile festival.new/lib/Makefile
--- festival/lib/Makefile 2003-01-15 14:42:32.000000000 +0200
+++ festival.new/lib/Makefile 2003-02-13 21:21:00.000000000 +0200
@@ -74,8 +74,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 '' ;\
@@ -85,7 +85,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 '' ;\
@@ -100,6 +100,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 $*
Only in festival.new/lib: Makefile.orig
diff -ur festival/lib/voices.scm festival.new/lib/voices.scm
--- festival/lib/voices.scm 2003-01-20 14:07:00.000000000 +0200
+++ festival.new/lib/voices.scm 2003-02-13 21:25:02.000000000 +0200
@@ -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/voices/")
"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.")
Only in festival.new/lib: voices.scm~
Only in festival.new/lib: voices.scm.orig
Only in festival.new/lib: voices.scm.rej
