This patch is part of a series of patches for festival for Debian GNU/Linux, to provide Debian specific building of festival --- a/config/make_system.mak +++ b/config/make_system.mak @@ -38,6 +38,10 @@ ## ## ########################################################################### +MACHINETYPE=unknown +OSTYPE=unknown +include config + system.mak : config @echo Check system type >&2 @/bin/sh $(TOP)/config/system.sh $(TOP)/config/systems > system.mak --- a/config/project.mak +++ b/config/project.mak @@ -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/$(DEB_HOST_MULTIARCH) +REQUIRED_LIBRARY_DIR_estbase = /usr/lib/$(DEB_HOST_MULTIARCH) +REQUIRED_LIBRARY_DIR_eststring = /usr/lib/$(DEB_HOST_MULTIARCH) REQUIRED_MAKE_INCLUDE = $(EST)/make.include --- a/config/systems/default.mak +++ b/config/systems/default.mak @@ -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 + --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ ALL = .config_error $(BUILD_DIRS) # Try and say if config hasn't been created -config_dummy := $(shell test -f config/config || ( echo '*** '; echo '*** Making default config file ***'; echo '*** '; ./configure; ) >&2) +#config_dummy := $(shell test -f config/config || ( echo '*** '; echo '*** Making default config file ***'; echo '*** '; ./configure; ) >&2) # force a check on the system file system_dummy := $(shell $(MAKE) -C $(TOP)/config -f make_system.mak TOP=.. system.mak) @@ -78,8 +78,9 @@ test: @ $(MAKE) --no-print-directory -C testsuite test -config/config: config/config.in config.status - ./config.status +# Conflicts with Debian build setup +#config/config: config/config.in config.status +# ./config.status configure: configure.in autoconf