diff --git festival.orig/config/config.in festival/config/config.in index d7a28e5..2c387d3 100644 --- festival.orig/config/config.in +++ festival/config/config.in @@ -20,7 +20,7 @@ EST=$(TOP)/../speech_tools ## You may need to set this explicitly if automounter or NFS ## side effects cause problems -FESTIVAL_HOME := $(shell (cd $(TOP); pwd)) +FESTIVAL_HOME := /usr ########################################################################### ## Feature selection. diff --git festival.orig/config/project.mak festival/config/project.mak index 3f36fd6..1160732 100644 --- festival.orig/config/project.mak +++ festival/config/project.mak @@ -103,6 +103,5 @@ LIBRARY_TEMPLATE_DIRS_estools = $(LIBRARY_TEMPLATE_DIRS:%=$(EST)/%) DOCXX_DIRS = $(TOP)/src MODULE_TO_DOCXX = perl $(TOP)/src/modules/utilities/extract_module_doc++.prl -FTLIBDIR = $(FESTIVAL_HOME)/lib - +FTLIBDIR = /usr/share/festival diff --git festival.orig/config/systems/Linux.mak festival/config/systems/Linux.mak index 7b7cb51..1fbba94 100644 --- festival.orig/config/systems/Linux.mak +++ festival/config/systems/Linux.mak @@ -41,7 +41,7 @@ include $(EST)/config/systems/default.mak TCL_LIBRARY = -ltcl -OS_LIBS = -ldl +OS_LIBS = -ldl -lncurses ## the native audio module for this type of system NATIVE_AUDIO_MODULE = LINUX16 diff --git festival.orig/config/systems/default.mak festival/config/systems/default.mak index 602ff77..46ef454 100644 --- festival.orig/config/systems/default.mak +++ festival/config/systems/default.mak @@ -40,7 +40,7 @@ ########################################################################### ## Installation directories -INSTALL_PREFIX=/usr/local +INSTALL_PREFIX=/usr BINDIR=$(INSTALL_PREFIX)/bin LIBDIR=$(INSTALL_PREFIX)/lib @@ -63,8 +63,8 @@ NAS_LIB = /usr/X11R6/lib ########################################################################### ## Where to find Enlightenment Speech Demon -ESD_INCLUDE = /usr/local/include -ESD_LIB = /usr/local/lib +ESD_INCLUDE = /usr/include +ESD_LIB = /usr/lib ########################################################################### ## Where to find X11 @@ -75,14 +75,14 @@ X11_LIB = /usr/X11R6/lib ########################################################################### ## TCL support -TCL_INCLUDE = /usr/local/include -TCL_LIB = /usr/local/lib -TCL_LIBRARY = -ltcl7.6 +TCL_INCLUDE = /usr/include +TCL_LIB = /usr/lib +TCL_LIBRARY = -ltcl ########################################################################### ## Efence library for malloc debugging -EFENCE_LIB = /usr/local/lib +EFENCE_LIB = /usr/lib ########################################################################### ## Commands.