114 lines
3.4 KiB
Diff
114 lines
3.4 KiB
Diff
diff --git speech_tools.orig/config/config.in speech_tools/config/config.in
|
|
index 1e24249..67fbf9f 100644
|
|
--- speech_tools.orig/config/config.in
|
|
+++ speech_tools/config/config.in
|
|
@@ -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 @@ EST_HOME := $(shell (cd $(EST); pwd))
|
|
##
|
|
## 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
|
|
|
|
###########################################################################
|
|
## Pre defined configurations (for directory locations, setup peculiarities
|
|
@@ -55,7 +55,7 @@ WARN=1
|
|
# VERBOSE=1
|
|
#DEBUG=1
|
|
# PROFILE=gprof
|
|
-#SHARED=2
|
|
+SHARED=2
|
|
|
|
## Directory specific selections which override the above
|
|
|
|
@@ -92,7 +92,7 @@ LINUXAUDIO = @LINUXAUDIO@
|
|
## It may not work under all systems, so may be optionally omitted.
|
|
INCLUDE_MODULES += EDITLINE
|
|
|
|
-TERMCAPLIB = @TERMCAPLIB@
|
|
+TERMCAPLIB =
|
|
# speech recognition
|
|
#INCLUDE_MODULES += ASR
|
|
|
|
@@ -152,7 +152,7 @@ INCLUDE_MODULES += RXP
|
|
CONFIG_WRAPPER_LANGUAGES = PYTHON
|
|
|
|
# Language specific includes should be set to correct site paths
|
|
-CONFIG_PYTHON_INCLUDES= -I/usr/include/python2.2/
|
|
+CONFIG_PYTHON_INCLUDES= -I/usr/include/python2.7/
|
|
##
|
|
###################################################################
|
|
|
|
diff --git speech_tools.orig/config/systems/Linux.mak speech_tools/config/systems/Linux.mak
|
|
index 7b7cb51..1fbba94 100644
|
|
--- speech_tools.orig/config/systems/Linux.mak
|
|
+++ speech_tools/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 speech_tools.orig/config/systems/default.mak speech_tools/config/systems/default.mak
|
|
index 24d6dea..937fb5c 100644
|
|
--- speech_tools.orig/config/systems/default.mak
|
|
+++ speech_tools/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.
|