]>
Commit | Line | Data |
---|---|---|
f344b0b6 | 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 | |
4 | @@ -10,7 +10,7 @@ | |
5 | ########################################################################### | |
6 | ## Which speech tools to use | |
7 | ||
8 | -EST=$(TOP)/../speech_tools | |
9 | +EST=/usr/lib/speech_tools | |
10 | ||
11 | ########################################################################### | |
12 | ## Where the festival tree will be installed. | |
13 | @@ -20,7 +20,7 @@ | |
14 | ## You may need to set this explicitly if automounter or NFS | |
15 | ## side effects cause problems | |
16 | ||
17 | -FESTIVAL_HOME := $(shell (cd $(TOP); pwd)) | |
18 | +FESTIVAL_HOME := /usr/share/festival | |
19 | ||
20 | ########################################################################### | |
21 | ## Feature selection. | |
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 | |
ffba4b53 PS |
25 | @@ -43,7 +43,7 @@ |
26 | MOD_DESC_EDITLINE=Use editline for command line editing and history | |
f344b0b6 | 27 | |
28 | IO_DEFINES += -DSUPPORT_EDITLINE $(MODULE_EDITLINE_OPTIONS:%=-DEDITLINE_%) | |
ffba4b53 | 29 | -MODULE_LIBS += $(TERMCAPLIB) |
f344b0b6 | 30 | +MODULE_LIBS += -lncurses |
ffba4b53 PS |
31 | |
32 | ifeq ($(DIRNAME),siod) | |
33 | CSRCS := $(CSRCS) el_complete.c editline.c el_sys_unix.c | |
34 | ||
f344b0b6 | 35 | diff -ruN festival./config/project.mak festival/config/project.mak |
36 | --- festival./config/project.mak Fri Jul 20 13:21:54 2001 | |
37 | +++ festival/config/project.mak Wed Jul 10 13:12:51 2002 | |
38 | @@ -70,8 +70,8 @@ | |
39 | ||
40 | # Place where programs are compiled | |
41 | ||
42 | -PROJECT_MAIN_DIR=$(FESTIVAL_HOME)/src/main | |
43 | -PROJECT_SCRIPTS_DIR=$(FESTIVAL_HOME)/src/scripts | |
44 | +PROJECT_MAIN_DIR=$(TOP)/src/main | |
45 | +PROJECT_SCRIPTS_DIR=$(TOP)/src/scripts | |
46 | ||
47 | # Where the main RCS tree is, probably only used within CSTR | |
48 | ||
49 | @@ -86,9 +86,9 @@ | |
50 | # Libraries used from other projects | |
51 | ||
52 | REQUIRED_LIBRARIES = estools estbase eststring | |
53 | -REQUIRED_LIBRARY_DIR_estools = $(EST)/lib | |
54 | -REQUIRED_LIBRARY_DIR_estbase = $(EST)/lib | |
55 | -REQUIRED_LIBRARY_DIR_eststring = $(EST)/lib | |
56 | +REQUIRED_LIBRARY_DIR_estools = /usr/lib | |
57 | +REQUIRED_LIBRARY_DIR_estbase = /usr/lib | |
58 | +REQUIRED_LIBRARY_DIR_eststring = /usr/lib | |
59 | ||
60 | REQUIRED_MAKE_INCLUDE = $(EST)/make.include | |
61 | ||
62 | diff -ruN festival./config/systems/default.mak festival/config/systems/default.mak | |
63 | --- festival./config/systems/default.mak Wed Apr 4 13:55:32 2001 | |
64 | +++ festival/config/systems/default.mak Wed Jul 10 13:12:51 2002 | |
65 | @@ -142,3 +142,6 @@ | |
66 | JAVA_COMPILER_VERSION_COMMAND=true | |
67 | ||
68 | JAVA_SYSTEM_INCLUDES = -I$(JAVA_HOME)/include/genunix | |
69 | + | |
70 | +GCC_MAKE_SHARED_LIB = gcc -shared -o XXX | |
71 | + | |
72 | diff -ruN festival./doc/Makefile festival/doc/Makefile | |
73 | --- festival./doc/Makefile Wed Apr 4 13:55:21 2001 | |
74 | +++ festival/doc/Makefile Wed Jul 10 13:12:47 2002 | |
75 | @@ -44,7 +44,7 @@ | |
76 | ||
77 | EXAMPLE_TO_DOCUMENT= | |
78 | ||
79 | -FESTIVAL=$(TOP)/bin/festival --libdir $(TOP)/lib | |
80 | +FESTIVAL=$(TOP)/src/main/festival --libdir $(TOP)/lib | |
81 | ||
82 | # Include some of EST documentation. | |
83 | DOCXX_EXTRA_FILES = | |
84 | @@ -72,9 +72,9 @@ | |
85 | %.1 : %.head %.options %.tail | |
86 | cat $^ >$@ | |
87 | %.options : $(TOP)/src/main/% | |
88 | - $(TOP)/bin/$* -man_options >$@ | |
89 | + $(TOP)/src/main/$* -man_options >$@ | |
90 | %.options : $(TOP)/src/main/%.exe | |
91 | - $(TOP)/bin/$* -man_options >$@ | |
92 | + $(TOP)/src/main/$* -man_options >$@ | |
93 | ||
94 | festival.info: festival.texi festfunc.texi festvars.texi festfeat.texi | |
95 | @ if [ ! -d info ] ; \ | |
96 | diff -ruN festival./examples/Makefile festival/examples/Makefile | |
97 | --- festival./examples/Makefile Wed Apr 4 15:12:35 2001 | |
98 | +++ festival/examples/Makefile Wed Jul 10 13:12:47 2002 | |
99 | @@ -52,7 +52,7 @@ | |
100 | $(ALL) : % : %.sh | |
101 | rm -f $@ | |
102 | @echo "#!/bin/sh" >$@ | |
103 | - @echo "\"true\" ; exec "$(FESTIVAL_HOME)/bin/festival --script '$$0 $$*' >>$@ | |
104 | + @echo "\"true\" ; exec "/usr/bin/festival --script '$$0 $$*' >>$@ | |
105 | cat $< >>$@ | |
106 | chmod +x $@ | |
107 | ||
108 | diff -ruN festival./lib/Makefile festival/lib/Makefile | |
109 | --- festival./lib/Makefile Mon Jun 4 00:56:20 2001 | |
110 | +++ festival/lib/Makefile Wed Jul 10 13:13:33 2002 | |
111 | @@ -73,8 +73,8 @@ | |
112 | .copy_from_est: $(SIOD) | |
113 | @: | |
114 | ||
115 | -$(SIOD) : % : $(EST)/lib/siod/% | |
116 | - @echo 'Copy $* from EST/lib/siod' | |
117 | +$(SIOD) : % : $(EST)/siod/% | |
118 | + @echo 'Copy $* from EST/siod' | |
119 | @$(RM) -f $* | |
120 | @{ \ | |
121 | echo '' ;\ | |
122 | @@ -84,7 +84,7 @@ | |
123 | echo ' ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;' ;\ | |
124 | echo ' ;;; DO NOT EDIT THIS FILE ON PAIN OF MORE PAIN.' ;\ | |
125 | echo ' ;;; ' ;\ | |
126 | - echo ' ;;; The master copy of this file is in $(EST)/lib/siod/$*' ;\ | |
127 | + echo ' ;;; The master copy of this file is in $(EST)/siod/$*' ;\ | |
128 | echo ' ;;; and is copied here at build time.' ;\ | |
129 | echo ' ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;' ;\ | |
130 | echo '' ;\ | |
131 | @@ -99,6 +99,6 @@ | |
132 | echo '' ;\ | |
133 | echo '' ;\ | |
134 | echo '' ;\ | |
135 | - } | cat - $(EST)/lib/siod/$* |sed -e '/mode: *scheme/s//mode: view/' > $* | |
136 | + } | cat - $(EST)/siod/$* |sed -e '/mode: *scheme/s//mode: view/' > $* | |
137 | @chmod a-w $* | |
138 | ||
139 | diff -ruN festival./lib/voices.scm festival/lib/voices.scm | |
140 | --- festival./lib/voices.scm Wed Apr 4 15:12:35 2001 | |
141 | +++ festival/lib/voices.scm Wed Jul 10 13:12:47 2002 | |
142 | @@ -42,7 +42,7 @@ | |
143 | ;; The path to search for voices is created from the load-path with | |
144 | ;; an extra list of directories appended. | |
145 | ||
ffba4b53 PS |
146 | -(defvar system-voice-path '( ) |
147 | +(defvar system-voice-path '("/usr/share/festival/lib/voices-1.4/" ) | |
f344b0b6 | 148 | "system-voice-path |
149 | Additional directory not near the load path where voices can be | |
150 | found, this can be redefined in lib/sitevars.scm if desired.") |