1 diff -ruN festival./config/config.in festival/config/config.in
2 --- festival./config/config.in Wed Apr 4 15:12:35 2001
3 +++ festival/config/config.in Wed Jul 10 13:12:47 2002
5 ###########################################################################
6 ## Which speech tools to use
8 -EST=$(TOP)/../speech_tools
9 +EST=/usr/lib/speech_tools
11 ###########################################################################
12 ## Where the festival tree will be installed.
14 ## You may need to set this explicitly if automounter or NFS
15 ## side effects cause problems
17 -FESTIVAL_HOME := $(shell (cd $(TOP); pwd))
18 +FESTIVAL_HOME := /usr/share/festival
20 ###########################################################################
22 diff -ruN festival./config/modules/editline.mak festival/config/modules/editline.mak
23 --- festival./config/modules/editline.mak Wed Apr 4 13:55:20 2001
24 +++ festival/config/modules/editline.mak Wed Jul 10 13:12:51 2002
26 MOD_DESC_EDITLINE=Use editline for command line editor and history
28 IO_DEFINES += -DSUPPORT_EDITLINE $(MODULE_EDITLINE_OPTIONS:%=-DEDITLINE_%)
29 -MODULE_LIBS += -ltermcap
30 +MODULE_LIBS += -lncurses
31 diff -ruN festival./config/project.mak festival/config/project.mak
32 --- festival./config/project.mak Fri Jul 20 13:21:54 2001
33 +++ festival/config/project.mak Wed Jul 10 13:12:51 2002
36 # Place where programs are compiled
38 -PROJECT_MAIN_DIR=$(FESTIVAL_HOME)/src/main
39 -PROJECT_SCRIPTS_DIR=$(FESTIVAL_HOME)/src/scripts
40 +PROJECT_MAIN_DIR=$(TOP)/src/main
41 +PROJECT_SCRIPTS_DIR=$(TOP)/src/scripts
43 # Where the main RCS tree is, probably only used within CSTR
46 # Libraries used from other projects
48 REQUIRED_LIBRARIES = estools estbase eststring
49 -REQUIRED_LIBRARY_DIR_estools = $(EST)/lib
50 -REQUIRED_LIBRARY_DIR_estbase = $(EST)/lib
51 -REQUIRED_LIBRARY_DIR_eststring = $(EST)/lib
52 +REQUIRED_LIBRARY_DIR_estools = /usr/lib
53 +REQUIRED_LIBRARY_DIR_estbase = /usr/lib
54 +REQUIRED_LIBRARY_DIR_eststring = /usr/lib
56 REQUIRED_MAKE_INCLUDE = $(EST)/make.include
58 diff -ruN festival./config/systems/default.mak festival/config/systems/default.mak
59 --- festival./config/systems/default.mak Wed Apr 4 13:55:32 2001
60 +++ festival/config/systems/default.mak Wed Jul 10 13:12:51 2002
62 JAVA_COMPILER_VERSION_COMMAND=true
64 JAVA_SYSTEM_INCLUDES = -I$(JAVA_HOME)/include/genunix
66 +GCC_MAKE_SHARED_LIB = gcc -shared -o XXX
68 diff -ruN festival./doc/Makefile festival/doc/Makefile
69 --- festival./doc/Makefile Wed Apr 4 13:55:21 2001
70 +++ festival/doc/Makefile Wed Jul 10 13:12:47 2002
75 -FESTIVAL=$(TOP)/bin/festival --libdir $(TOP)/lib
76 +FESTIVAL=$(TOP)/src/main/festival --libdir $(TOP)/lib
78 # Include some of EST documentation.
81 %.1 : %.head %.options %.tail
83 %.options : $(TOP)/src/main/%
84 - $(TOP)/bin/$* -man_options >$@
85 + $(TOP)/src/main/$* -man_options >$@
86 %.options : $(TOP)/src/main/%.exe
87 - $(TOP)/bin/$* -man_options >$@
88 + $(TOP)/src/main/$* -man_options >$@
90 festival.info: festival.texi festfunc.texi festvars.texi festfeat.texi
91 @ if [ ! -d info ] ; \
92 diff -ruN festival./examples/Makefile festival/examples/Makefile
93 --- festival./examples/Makefile Wed Apr 4 15:12:35 2001
94 +++ festival/examples/Makefile Wed Jul 10 13:12:47 2002
99 - @echo "\"true\" ; exec "$(FESTIVAL_HOME)/bin/festival --script '$$0 $$*' >>$@
100 + @echo "\"true\" ; exec "/usr/bin/festival --script '$$0 $$*' >>$@
104 diff -ruN festival./lib/Makefile festival/lib/Makefile
105 --- festival./lib/Makefile Mon Jun 4 00:56:20 2001
106 +++ festival/lib/Makefile Wed Jul 10 13:13:33 2002
108 .copy_from_est: $(SIOD)
111 -$(SIOD) : % : $(EST)/lib/siod/%
112 - @echo 'Copy $* from EST/lib/siod'
113 +$(SIOD) : % : $(EST)/siod/%
114 + @echo 'Copy $* from EST/siod'
119 echo ' ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;' ;\
120 echo ' ;;; DO NOT EDIT THIS FILE ON PAIN OF MORE PAIN.' ;\
122 - echo ' ;;; The master copy of this file is in $(EST)/lib/siod/$*' ;\
123 + echo ' ;;; The master copy of this file is in $(EST)/siod/$*' ;\
124 echo ' ;;; and is copied here at build time.' ;\
125 echo ' ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;' ;\
131 - } | cat - $(EST)/lib/siod/$* |sed -e '/mode: *scheme/s//mode: view/' > $*
132 + } | cat - $(EST)/siod/$* |sed -e '/mode: *scheme/s//mode: view/' > $*
135 diff -ruN festival./lib/voices.scm festival/lib/voices.scm
136 --- festival./lib/voices.scm Wed Apr 4 15:12:35 2001
137 +++ festival/lib/voices.scm Wed Jul 10 13:12:47 2002
139 ;; The path to search for voices is created from the load-path with
140 ;; an extra list of directories appended.
142 -(defvar system-voice-path '("/projects/festival/lib/voices-1.4/")
143 +(defvar system-voice-path '("/usr/share/festival/lib/voices-1.4/")
145 Additional directory not near the load path where voices can be
146 found, this can be redefined in lib/sitevars.scm if desired.")