From 124f7d234ce6c78404cd40983ac78af276769c46 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Wed, 8 Mar 2006 02:38:38 +0000 Subject: [PATCH] build tweak git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@795 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- Makefile.am | 3 ++- Makefile.in | 3 ++- conf/freeswitch.conf | 2 +- modules.conf.in | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5fe88860bd..c43b06c192 100644 --- a/Makefile.am +++ b/Makefile.am @@ -190,6 +190,7 @@ modwipe: install_mod: modules @echo Installing $(NAME) @mkdir -p $(PREFIX) $(PREFIX)/conf $(PREFIX)/mod $(PREFIX)/db $(PREFIX)/log $(PREFIX)/bin $(PREFIX)/scripts + @if [ ! -f $(PREFIX)/conf/freeswitch.conf ] ; then /bin/cp -p conf/freeswitch.conf $(PREFIX)/conf/; fi @if [ -f .libs/$(NAME) ] ; then /bin/cp -p .libs/$(NAME) $(PREFIX)/bin ; else /bin/cp -p ./$(NAME) $(PREFIX)/bin ; fi @echo Installing Modules @rm -f build/freeswitch.env @@ -204,7 +205,7 @@ install_mod: modules @./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) -lfreeswitch" @./build/addenv.sh build/freeswitch.env CFLAGS "-Werror $(AM_CFLAGS)" @./build/addenv.sh build/freeswitch.env CC "$(CC)" - @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making clean $$i ; $(PWD)/build/modmake.sh $(PWD) $$i install || exit 1; done + @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making install $$i ; $(PWD)/build/modmake.sh $(PWD) $$i install || exit 1; done @rm -f build/freeswitch.env @echo done diff --git a/Makefile.in b/Makefile.in index f816c32461..4595c81f30 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1069,6 +1069,7 @@ modwipe: install_mod: modules @echo Installing $(NAME) @mkdir -p $(PREFIX) $(PREFIX)/conf $(PREFIX)/mod $(PREFIX)/db $(PREFIX)/log $(PREFIX)/bin $(PREFIX)/scripts + @if [ ! -f $(PREFIX)/conf/freeswitch.conf ] ; then /bin/cp -p conf/freeswitch.conf $(PREFIX)/conf/; fi @if [ -f .libs/$(NAME) ] ; then /bin/cp -p .libs/$(NAME) $(PREFIX)/bin ; else /bin/cp -p ./$(NAME) $(PREFIX)/bin ; fi @echo Installing Modules @rm -f build/freeswitch.env @@ -1083,7 +1084,7 @@ install_mod: modules @./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) -lfreeswitch" @./build/addenv.sh build/freeswitch.env CFLAGS "-Werror $(AM_CFLAGS)" @./build/addenv.sh build/freeswitch.env CC "$(CC)" - @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making clean $$i ; $(PWD)/build/modmake.sh $(PWD) $$i install || exit 1; done + @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making install $$i ; $(PWD)/build/modmake.sh $(PWD) $$i install || exit 1; done @rm -f build/freeswitch.env @echo done diff --git a/conf/freeswitch.conf b/conf/freeswitch.conf index ff70919493..9ce6d71b9d 100644 --- a/conf/freeswitch.conf +++ b/conf/freeswitch.conf @@ -53,7 +53,7 @@ load => mod_softtimer ;load => mod_perl ; ASR /TTS -;load => asr_tts/mod_cepstral +;load => mod_cepstral diff --git a/modules.conf.in b/modules.conf.in index a53aa08b27..3e50d90251 100644 --- a/modules.conf.in +++ b/modules.conf.in @@ -24,5 +24,5 @@ dialplans/mod_pcre #asr_tts/mod_cepstral #languages/mod_spidermonkey #languages/mod_perl -#asr_tts/mod_cepstral +