[packages/festival.git] / festival-config.patch

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,4 +43,4 @@
 MOD_DESC_EDITLINE=Use editline for command line editor and history
 
 IO_DEFINES   += -DSUPPORT_EDITLINE $(MODULE_EDITLINE_OPTIONS:%=-DEDITLINE_%)
-MODULE_LIBS  += -ltermcap
+MODULE_LIBS  += -lncurses
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 '("/projects/festival/lib/voices-1.4/")
+(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.")
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
	25	@@ -43,4 +43,4 @@
	26	MOD_DESC_EDITLINE=Use editline for command line editor and history
	27
	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
	34	@@ -70,8 +70,8 @@
	35
	36	# Place where programs are compiled
	37
	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
	42
	43	# Where the main RCS tree is, probably only used within CSTR
	44
	45	@@ -86,9 +86,9 @@
	46	# Libraries used from other projects
	47
	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
	55
	56	REQUIRED_MAKE_INCLUDE = $(EST)/make.include
	57
	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
	61	@@ -142,3 +142,6 @@
	62	JAVA_COMPILER_VERSION_COMMAND=true
	63
	64	JAVA_SYSTEM_INCLUDES = -I$(JAVA_HOME)/include/genunix
65	+
66	+GCC_MAKE_SHARED_LIB = gcc -shared -o XXX
67	+
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
71	@@ -44,7 +44,7 @@
72
73	EXAMPLE_TO_DOCUMENT=
74
75	-FESTIVAL=$(TOP)/bin/festival --libdir $(TOP)/lib
76	+FESTIVAL=$(TOP)/src/main/festival --libdir $(TOP)/lib
77
78	# Include some of EST documentation.
79	DOCXX_EXTRA_FILES =
80	@@ -72,9 +72,9 @@
81	%.1 : %.head %.options %.tail
82	cat $^ >$@
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 >$@
89
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
95	@@ -52,7 +52,7 @@
96	$(ALL) : % : %.sh
97	rm -f $@
98	@echo "#!/bin/sh" >$@
99	- @echo "\"true\" ; exec "$(FESTIVAL_HOME)/bin/festival --script '$$0 $$*' >>$@
100	+ @echo "\"true\" ; exec "/usr/bin/festival --script '$$0 $$*' >>$@
101	cat $< >>$@
102	chmod +x $@
103
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
107	@@ -73,8 +73,8 @@
108	.copy_from_est: $(SIOD)
109	@:
110
111	-$(SIOD) : % : $(EST)/lib/siod/%
112	- @echo 'Copy $* from EST/lib/siod'
113	+$(SIOD) : % : $(EST)/siod/%
114	+ @echo 'Copy $* from EST/siod'
115	@$(RM) -f $*
116	@{ \
117	echo '' ;\
118	@@ -84,7 +84,7 @@
119	echo ' ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;' ;\
120	echo ' ;;; DO NOT EDIT THIS FILE ON PAIN OF MORE PAIN.' ;\
121	echo ' ;;; ' ;\
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 ' ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;' ;\
126	echo '' ;\
127	@@ -99,6 +99,6 @@
128	echo '' ;\
129	echo '' ;\
130	echo '' ;\
131	- } \| cat - $(EST)/lib/siod/$* \|sed -e '/mode: scheme/s//mode: view/' > $
132	+ } \| cat - $(EST)/siod/$* \|sed -e '/mode: scheme/s//mode: view/' > $
133	@chmod a-w $*
134
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
138	@@ -42,7 +42,7 @@
139	;; The path to search for voices is created from the load-path with
140	;; an extra list of directories appended.
141
142	-(defvar system-voice-path '("/projects/festival/lib/voices-1.4/")
143	+(defvar system-voice-path '("/usr/share/festival/lib/voices-1.4/")
144	"system-voice-path
145	Additional directory not near the load path where voices can be
146	found, this can be redefined in lib/sitevars.scm if desired.")