[arch-commits] Commit in festival/trunk (5 files)
Ray Rashif
schiv at archlinux.org
Wed Dec 8 06:43:53 UTC 2010
Date: Wednesday, December 8, 2010 @ 01:43:53
Author: schiv
Revision: 102549
upgpkg: festival 2.1-1
upstream release
Added:
festival/trunk/festconfig.patch
festival/trunk/speechconfig.patch
Modified:
festival/trunk/PKGBUILD
Deleted:
festival/trunk/config.diff
festival/trunk/festconfig.diff
--------------------+
PKGBUILD | 58 ++++++++++----------
config.diff | 145 ---------------------------------------------------
festconfig.diff | 84 -----------------------------
festconfig.patch | 84 +++++++++++++++++++++++++++++
speechconfig.patch | 132 ++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 246 insertions(+), 257 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-12-08 03:29:29 UTC (rev 102548)
+++ PKGBUILD 2010-12-08 06:43:53 UTC (rev 102549)
@@ -4,43 +4,45 @@
# Contributor: Simo Leone <neotuli at gmail.com>
pkgname=festival
-pkgver=2.0.95
+pkgver=2.1
+_suffix=release
pkgrel=1
-pkgdesc="A general multi-lingual speech synthesis system developed at CSTR (Centre for Speech Technology Research)"
+pkgdesc="A general multi-lingual speech synthesis system"
arch=('i686' 'x86_64')
url="http://www.cstr.ed.ac.uk/projects/festival/"
license=('BSD' 'GPL' 'custom')
depends=('perl')
options=('!makeflags')
-source=("http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}-beta.tar.gz"
- "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/speech_tools-${pkgver}-beta.tar.gz"
- "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_CMU.tar.gz"
- "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_OALD.tar.gz"
- "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_POSLEX.tar.gz"
- 'config.diff' 'festconfig.diff')
-md5sums=('9a9fb69229839bfe913f5376f7c65e31'
- 'b2954b7faf8bd0aa441786648cf02302'
- '6a2ee4fed7c3ebedf197a3b8524ccb87'
- '84af32a914d996f57bc4cb36fe8cdc97'
- 'aa80f9250065b318325f16fdad3a4484'
- '135cd5b093eadc92e7a03f00fff2d1aa'
- '348cc033430aee7989463198818ae74c')
+source=("http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}-${_suffix}.tar.gz"
+ "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/speech_tools-${pkgver}-${_suffix}.tar.gz"
+ "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_CMU.tar.gz"
+ "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_OALD.tar.gz"
+ "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_POSLEX.tar.gz"
+ 'speechconfig.patch'
+ 'festconfig.patch')
+md5sums=('c93eb3e389ed171ab9abd46afe8897a8'
+ '6920ddc75b042910a3bcfee3ab106938'
+ '6a2ee4fed7c3ebedf197a3b8524ccb87'
+ '84af32a914d996f57bc4cb36fe8cdc97'
+ 'aa80f9250065b318325f16fdad3a4484'
+ '550abd77dc20e444673d6ecf87a60fe9'
+ '348cc033430aee7989463198818ae74c')
build() {
# Build Speech Tools first
cd $srcdir/speech_tools
- patch -Np1 -i $srcdir/config.diff
+ patch -Np1 -i $srcdir/speechconfig.patch
./configure --prefix=/usr --sysconfdir=/etc
- make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" || return 1
-
+ make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}"
+
# Build Festival itself
cd $srcdir/festival
- patch -Np1 -i $srcdir/festconfig.diff
-
+ patch -Np1 -i $srcdir/festconfig.patch
+
# Aviod make failure on making scripts and docs
sed -i "s#examples bin doc#examples#" Makefile
-
+
./configure --prefix=/usr --sysconfdir=/etc
make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}"
}
@@ -51,19 +53,19 @@
install -dm755 $pkgdir/usr/{bin,lib,include/speech_tools/{,instantiate,ling_class,rxp,sigpr,unix}}
#binaries
- #move binaries over wrappers (FS#7864)
- for i in `grep -l 'EST shared script' bin/*`; do
- cp -f main/$(basename $i) bin;
+ #move binaries over wrappers (FS#7864)
+ for i in `grep -l 'EST shared script' bin/*`; do
+ cp -f main/$(basename $i) bin;
done
install -m755 -t $pkgdir/usr/bin bin/[a-z]*
rm -f $pkgdir/usr/bin/{est_gdb,est_examples,est_program}
-
+
#libraries
install -m755 -t $pkgdir/usr/lib lib/lib*.so.*
ln -sf libestbase.so.${pkgver}.1 $pkgdir/usr/lib/libestbase.so
ln -sf libeststring.so.1.2 $pkgdir/usr/lib/libeststring.so
install -m644 -t $pkgdir/usr/lib lib/lib*.a
-
+
#headers
for dir in {.,instantiate,ling_class,rxp,sigpr,unix}; do
install -m644 -t ${pkgdir}/usr/include/speech_tools/$dir include/$dir/*.h
@@ -90,10 +92,10 @@
#need to clean up but requires knowing which files are actually needed...
cp -aR lib/* $pkgdir/usr/share/festival
rm -f $(find $pkgdir/usr/share/festival -name Makefile)
-
+
#create voices directory
install -dm755 $pkgdir/usr/share/festival/voices
-
+
#licenses
install -D -m644 $srcdir/festival/COPYING \
$pkgdir/usr/share/licenses/$pkgname/LICENSE
Deleted: config.diff
===================================================================
--- config.diff 2010-12-08 03:29:29 UTC (rev 102548)
+++ config.diff 2010-12-08 06:43:53 UTC (rev 102549)
@@ -1,145 +0,0 @@
-diff -Nru speech_tools.orig/config/compilers/jdk.mak speech_tools/config/compilers/jdk.mak
---- speech_tools.orig/config/compilers/jdk.mak 2001-04-04 06:55:32.000000000 -0500
-+++ speech_tools/config/compilers/jdk.mak 2005-05-30 19:50:54.000000000 -0500
-@@ -52,7 +52,7 @@
- endif
- endif
-
--JAVAFLAGS = -depend
-+JAVAFLAGS =
-
- DEBUG_JAVAFLAGS = -g
-
-diff -Nru speech_tools.orig/config/systems/Linux.mak speech_tools/config/systems/Linux.mak
---- speech_tools.orig/config/systems/Linux.mak 2001-04-04 06:55:32.000000000 -0500
-+++ speech_tools/config/systems/Linux.mak 2005-05-30 19:52:06.000000000 -0500
-@@ -40,13 +40,13 @@
-
- include $(EST)/config/systems/default.mak
-
--DEFAULT_JAVA_HOME=/usr/lib/jdk-1.1.6
-+DEFAULT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk
- JAVA=/usr/bin/java
- JAVAC=/usr/bin/javac
- JAVAH=/usr/bin/javah
-
- TCL_LIBRARY = -ltcl
--OS_LIBS = -ldl
-+OS_LIBS = -ldl -lncurses
-
- ## the native audio module for this type of system
- NATIVE_AUDIO_MODULE = LINUX16
-diff -Nru speech_tools.orig/config/systems/default.mak speech_tools/config/systems/default.mak
---- speech_tools.orig/config/systems/default.mak 2004-01-30 18:04:02.000000000 -0600
-+++ speech_tools/config/systems/default.mak 2005-05-30 19:50:54.000000000 -0500
-@@ -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 @@
- ###########################################################################
- ## 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 @@
- ###########################################################################
- ## 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.
---- a/config/config.in 2006-07-08 13:06:18.000000000 -0500
-+++ b/config/config.in.new 2007-06-27 10:35:51.000000000 -0500
-@@ -15,7 +15,7 @@
- ## You may need to set this explicitly if automounter or NFS
- ## side effects cause problems
-
--EST_HOME := $(shell (cd $(EST); pwd))
-+EST_HOME := /usr
-
- ###########################################################################
- ## System type.
-@@ -28,14 +28,14 @@
- ##
- ## Examples: sparc_SunOS5 intel_Linux2.0
-
--SYSTEM_TYPE=$(MACHINETYPE)_$(OSTYPE)$(OSREV)
-+SYSTEM_TYPE=Linux
-
- ###########################################################################
- ## Compiler.
- ## The definitions are in compilers/$(COMPILER).mak
- ## Examples: gcc suncc egcs gcc28
-
--COMPILER=@COMPILERTYPE@
-+COMPILER=gcc
-
- ###########################################################################
- ## Java system to use if you include the Java interface.
-@@ -61,7 +61,7 @@
- # VERBOSE=1
- #DEBUG=1
- # PROFILE=gprof
--#SHARED=2
-+SHARED=1
-
- ## Directory specific selections which override the above
-
-@@ -94,7 +94,7 @@
- ## It may not work under all systems, so may be optionally omitted.
- INCLUDE_MODULES += EDITLINE
-
--TERMCAPLIB = @TERMCAPLIB@
-+TERMCAPLIB =
- # speech recognition
- #INCLUDE_MODULES += ASR
-
-@@ -165,8 +165,8 @@
- CONFIG_WRAPPER_LANGUAGES = PYTHON PERL5
-
- # Language specific includes should be set to correct site paths
--CONFIG_PYTHON_INCLUDES= -I/usr/include/python2.2/
--CONFIG_PERL_INCLUDES= -I/usr/lib/perl5/5.8.3/i386-linux-thread-multi/CORE/
-+CONFIG_PYTHON_INCLUDES= -I/usr/include/python2.6/
-+CONFIG_PERL_INCLUDES= -I/usr/lib/perl5/core_perl/CORE/
- #OR OLD#CONFIG_PERL_INCLUDES= -I/usr/lib/perl5/5.6.1/i386-linux/CORE/
- ##
- ###################################################################
---- a/config/compilers/gcc_defaults.mak 2006-08-05 10:37:59.000000000 -0500
-+++ b/config/compilers/gcc_defaults.mak.new 2007-06-27 10:43:51.000000000 -0500
-@@ -76,9 +76,9 @@
- PROFILE_gprof_CXXFLAGS = -pg
- PROFILE_gprof_LINKFLAGS = -pg
-
--SHARED_CCFLAGS = -fPIC -fno-shared-data
--SHARED_CXXFLAGS = -fPIC -fno-shared-data
--SHARED_LINKFLAGS = -fno-shared-data
-+SHARED_CCFLAGS = -fPIC
-+SHARED_CXXFLAGS = -fPIC
-+SHARED_LINKFLAGS =
-
- ifndef GCC_MAKE_SHARED_LIB
- MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX
Deleted: festconfig.diff
===================================================================
--- festconfig.diff 2010-12-08 03:29:29 UTC (rev 102548)
+++ festconfig.diff 2010-12-08 06:43:53 UTC (rev 102549)
@@ -1,84 +0,0 @@
-diff -Nru festival.orig/config/config.in festival/config/config.in
---- festival.orig/config/config.in 2004-06-21 15:52:42.000000000 -0500
-+++ festival/config/config.in 2005-05-30 19:50:45.000000000 -0500
-@@ -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
-
- ###########################################################################
- ## Feature selection.
-diff -Nru festival.orig/config/project.mak festival/config/project.mak
---- festival.orig/config/project.mak 2004-07-12 10:39:37.000000000 -0500
-+++ festival/config/project.mak 2005-05-30 19:50:45.000000000 -0500
-@@ -112,6 +112,5 @@
- 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 -Nru festival.orig/config/systems/Linux.mak festival/config/systems/Linux.mak
---- festival.orig/config/systems/Linux.mak 2001-04-04 06:55:32.000000000 -0500
-+++ festival/config/systems/Linux.mak 2005-05-30 19:51:28.000000000 -0500
-@@ -40,13 +40,13 @@
-
- include $(EST)/config/systems/default.mak
-
--DEFAULT_JAVA_HOME=/usr/lib/jdk-1.1.6
-+DEFAULT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk
- JAVA=/usr/bin/java
- JAVAC=/usr/bin/javac
- JAVAH=/usr/bin/javah
-
- TCL_LIBRARY = -ltcl
--OS_LIBS = -ldl
-+OS_LIBS = -ldl -lncurses
-
- ## the native audio module for this type of system
- NATIVE_AUDIO_MODULE = LINUX16
-diff -Nru festival.orig/config/systems/default.mak festival/config/systems/default.mak
---- festival.orig/config/systems/default.mak 2001-04-04 06:55:32.000000000 -0500
-+++ festival/config/systems/default.mak 2005-05-30 19:50:45.000000000 -0500
-@@ -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 @@
- ###########################################################################
- ## 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 @@
- ###########################################################################
- ## 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.
Added: festconfig.patch
===================================================================
--- festconfig.patch (rev 0)
+++ festconfig.patch 2010-12-08 06:43:53 UTC (rev 102549)
@@ -0,0 +1,84 @@
+diff -Nru festival.orig/config/config.in festival/config/config.in
+--- festival.orig/config/config.in 2004-06-21 15:52:42.000000000 -0500
++++ festival/config/config.in 2005-05-30 19:50:45.000000000 -0500
+@@ -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
+
+ ###########################################################################
+ ## Feature selection.
+diff -Nru festival.orig/config/project.mak festival/config/project.mak
+--- festival.orig/config/project.mak 2004-07-12 10:39:37.000000000 -0500
++++ festival/config/project.mak 2005-05-30 19:50:45.000000000 -0500
+@@ -112,6 +112,5 @@
+ 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 -Nru festival.orig/config/systems/Linux.mak festival/config/systems/Linux.mak
+--- festival.orig/config/systems/Linux.mak 2001-04-04 06:55:32.000000000 -0500
++++ festival/config/systems/Linux.mak 2005-05-30 19:51:28.000000000 -0500
+@@ -40,13 +40,13 @@
+
+ include $(EST)/config/systems/default.mak
+
+-DEFAULT_JAVA_HOME=/usr/lib/jdk-1.1.6
++DEFAULT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+ JAVA=/usr/bin/java
+ JAVAC=/usr/bin/javac
+ JAVAH=/usr/bin/javah
+
+ TCL_LIBRARY = -ltcl
+-OS_LIBS = -ldl
++OS_LIBS = -ldl -lncurses
+
+ ## the native audio module for this type of system
+ NATIVE_AUDIO_MODULE = LINUX16
+diff -Nru festival.orig/config/systems/default.mak festival/config/systems/default.mak
+--- festival.orig/config/systems/default.mak 2001-04-04 06:55:32.000000000 -0500
++++ festival/config/systems/default.mak 2005-05-30 19:50:45.000000000 -0500
+@@ -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 @@
+ ###########################################################################
+ ## 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 @@
+ ###########################################################################
+ ## 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.
Added: speechconfig.patch
===================================================================
--- speechconfig.patch (rev 0)
+++ speechconfig.patch 2010-12-08 06:43:53 UTC (rev 102549)
@@ -0,0 +1,132 @@
+diff -aur speech_tools.old//config/compilers/jdk.mak speech_tools/config/compilers/jdk.mak
+--- speech_tools.old//config/compilers/jdk.mak 2001-04-04 19:55:32.000000000 +0800
++++ speech_tools/config/compilers/jdk.mak 2010-12-08 12:14:56.076668109 +0800
+@@ -52,7 +52,7 @@
+ endif
+ endif
+
+-JAVAFLAGS = -depend
++JAVAFLAGS =
+
+ DEBUG_JAVAFLAGS = -g
+
+diff -aur speech_tools.old//config/config.in speech_tools/config/config.in
+--- speech_tools.old//config/config.in 2008-10-29 03:20:49.000000000 +0800
++++ speech_tools/config/config.in 2010-12-08 12:17:50.110001443 +0800
+@@ -15,7 +15,7 @@
+ ## You may need to set this explicitly if automounter or NFS
+ ## side effects cause problems
+
+-EST_HOME := $(shell (cd $(EST); pwd))
++EST_HOME := /usr
+
+ ###########################################################################
+ ## System type.
+@@ -28,14 +28,14 @@
+ ##
+ ## Examples: sparc_SunOS5 intel_Linux2.0
+
+-SYSTEM_TYPE=$(MACHINETYPE)_$(OSTYPE)$(OSREV)
++SYSTEM_TYPE=Linux
+
+ ###########################################################################
+ ## Compiler.
+ ## The definitions are in compilers/$(COMPILER).mak
+ ## Examples: gcc suncc egcs gcc28
+
+-COMPILER=@COMPILERTYPE@
++COMPILER=gcc
+
+ ###########################################################################
+ ## Java system to use if you include the Java interface.
+@@ -61,7 +61,7 @@
+ # VERBOSE=1
+ #DEBUG=1
+ # PROFILE=gprof
+-#SHARED=2
++SHARED=1
+
+ ## Directory specific selections which override the above
+
+@@ -98,7 +98,7 @@
+ ## It may not work under all systems, so may be optionally omitted.
+ INCLUDE_MODULES += EDITLINE
+
+-TERMCAPLIB = @TERMCAPLIB@
++TERMCAPLIB =
+ # speech recognition
+ #INCLUDE_MODULES += ASR
+
+@@ -169,8 +169,8 @@
+ CONFIG_WRAPPER_LANGUAGES = PYTHON PERL5
+
+ # Language specific includes should be set to correct site paths
+-CONFIG_PYTHON_INCLUDES= -I/usr/include/python2.2/
+-CONFIG_PERL_INCLUDES= -I/usr/lib/perl5/5.8.3/i386-linux-thread-multi/CORE/
++CONFIG_PYTHON_INCLUDES= -I/usr/include/python2.7/
++CONFIG_PERL_INCLUDES= -I/usr/lib/perl5/core_perl/CORE/
+ #OR OLD#CONFIG_PERL_INCLUDES= -I/usr/lib/perl5/5.6.1/i386-linux/CORE/
+ ##
+ ###################################################################
+Only in speech_tools/config: config.in.orig
+diff -aur speech_tools.old//config/systems/default.mak speech_tools/config/systems/default.mak
+--- speech_tools.old//config/systems/default.mak 2005-07-17 21:06:49.000000000 +0800
++++ speech_tools/config/systems/default.mak 2010-12-08 12:14:56.076668109 +0800
+@@ -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 @@
+ ###########################################################################
+ ## 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 @@
+ ###########################################################################
+ ## 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.
+diff -aur speech_tools.old//config/systems/Linux.mak speech_tools/config/systems/Linux.mak
+--- speech_tools.old//config/systems/Linux.mak 2001-04-04 19:55:32.000000000 +0800
++++ speech_tools/config/systems/Linux.mak 2010-12-08 12:14:56.076668109 +0800
+@@ -40,13 +40,13 @@
+
+ include $(EST)/config/systems/default.mak
+
+-DEFAULT_JAVA_HOME=/usr/lib/jdk-1.1.6
++DEFAULT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+ JAVA=/usr/bin/java
+ JAVAC=/usr/bin/javac
+ JAVAH=/usr/bin/javah
+
+ TCL_LIBRARY = -ltcl
+-OS_LIBS = -ldl
++OS_LIBS = -ldl -lncurses
+
+ ## the native audio module for this type of system
+ NATIVE_AUDIO_MODULE = LINUX16
More information about the arch-commits
mailing list