festival/trunk/festconfig.patch

   1 diff -Nru festival.orig/config/config.in festival/config/config.in
   2 --- festival.orig/config/config.in      2004-06-21 15:52:42.000000000 -0500
   3 +++ festival/config/config.in   2005-05-30 19:50:45.000000000 -0500
   4 @@ -20,7 +20,7 @@
   5  ## You may need to set this explicitly if automounter or NFS
   6  ## side effects cause problems
   7
   8 -FESTIVAL_HOME := $(shell (cd $(TOP); pwd))
   9 +FESTIVAL_HOME := /usr
  10
  11  ###########################################################################
  12  ## Feature selection.
  13 diff -Nru festival.orig/config/project.mak festival/config/project.mak
  14 --- festival.orig/config/project.mak    2004-07-12 10:39:37.000000000 -0500
  15 +++ festival/config/project.mak 2005-05-30 19:50:45.000000000 -0500
  16 @@ -112,6 +112,5 @@
  17  DOCXX_DIRS = $(TOP)/src
  18  MODULE_TO_DOCXX = perl $(TOP)/src/modules/utilities/extract_module_doc++.prl
  19
  20 -FTLIBDIR = $(FESTIVAL_HOME)/lib
  21 -
  22 +FTLIBDIR = /usr/share/festival
  23
  24 diff -Nru festival.orig/config/systems/Linux.mak festival/config/systems/Linux.mak
  25 --- festival.orig/config/systems/Linux.mak      2001-04-04 06:55:32.000000000 -0500
  26 +++ festival/config/systems/Linux.mak   2005-05-30 19:51:28.000000000 -0500
  27 @@ -40,13 +40,13 @@
  28
  29  include $(EST)/config/systems/default.mak
  30
  31 -DEFAULT_JAVA_HOME=/usr/lib/jdk-1.1.6
  32 +DEFAULT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk
  33  JAVA=/usr/bin/java
  34  JAVAC=/usr/bin/javac
  35  JAVAH=/usr/bin/javah
  36
  37  TCL_LIBRARY = -ltcl
  38 -OS_LIBS = -ldl
  39 +OS_LIBS = -ldl -lncurses
  40
  41  ## the native audio module for this type of system
  42  NATIVE_AUDIO_MODULE = LINUX16
  43 diff -Nru festival.orig/config/systems/default.mak festival/config/systems/default.mak
  44 --- festival.orig/config/systems/default.mak    2001-04-04 06:55:32.000000000 -0500
  45 +++ festival/config/systems/default.mak 2005-05-30 19:50:45.000000000 -0500
  46 @@ -40,7 +40,7 @@
  47  ###########################################################################
  48  ## Installation directories
  49
  50 -INSTALL_PREFIX=/usr/local
  51 +INSTALL_PREFIX=/usr
  52
  53  BINDIR=$(INSTALL_PREFIX)/bin
  54  LIBDIR=$(INSTALL_PREFIX)/lib
  55 @@ -63,8 +63,8 @@
  56  ###########################################################################
  57  ## Where to find Enlightenment Speech Demon
  58
  59 -ESD_INCLUDE = /usr/local/include
  60 -ESD_LIB = /usr/local/lib
  61 +ESD_INCLUDE = /usr/include
  62 +ESD_LIB = /usr/lib
  63
  64  ###########################################################################
  65  ## Where to find X11
  66 @@ -75,14 +75,14 @@
  67  ###########################################################################
  68  ## TCL support
  69
  70 -TCL_INCLUDE = /usr/local/include
  71 -TCL_LIB     = /usr/local/lib
  72 -TCL_LIBRARY = -ltcl7.6
  73 +TCL_INCLUDE = /usr/include
  74 +TCL_LIB     = /usr/lib
  75 +TCL_LIBRARY = -ltcl
  76
  77  ###########################################################################
  78  ## Efence library for malloc debugging
  79
  80 -EFENCE_LIB = /usr/local/lib
  81 +EFENCE_LIB = /usr/lib
  82
  83  ###########################################################################
  84  ## Commands.