kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-17 17:22:21 +00:00
Code Issues Projects Releases Wiki Activity

tweak var types in xml config, change makefile to install all the new broken out xml files.

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4027 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2007-01-23 01:40:14 +00:00
parent 3241200072
commit 88b2a8655c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -199,7 +199,7 @@ modwipe:
install_mod: modules install_mod: modules
@echo Installing $(NAME) @echo Installing $(NAME)
@mkdir -p $(PREFIX) $(PREFIX)/conf $(PREFIX)/mod $(PREFIX)/db $(PREFIX)/log $(PREFIX)/bin $(PREFIX)/scripts $(PREFIX)/htdocs $(PREFIX)/grammar @mkdir -p $(PREFIX) $(PREFIX)/conf $(PREFIX)/mod $(PREFIX)/db $(PREFIX)/log $(PREFIX)/bin $(PREFIX)/scripts $(PREFIX)/htdocs $(PREFIX)/grammar
@if [ ! -f $(PREFIX)/conf/freeswitch.xml ] ; then /bin/cp -p conf/freeswitch.xml $(PREFIX)/conf/; fi @if [ ! -f $(PREFIX)/conf/freeswitch.xml ] ; then /bin/cp -p conf/*.xml $(PREFIX)/conf/; fi
@if [ -f .libs/$(NAME) ] ; then /bin/cp -p .libs/$(NAME) $(PREFIX)/bin ; else /bin/cp -p ./$(NAME) $(PREFIX)/bin ; fi @if [ -f .libs/$(NAME) ] ; then /bin/cp -p .libs/$(NAME) $(PREFIX)/bin ; else /bin/cp -p ./$(NAME) $(PREFIX)/bin ; fi
@echo Installing Modules @echo Installing Modules
@rm -f build/freeswitch.env @rm -f build/freeswitch.env

2
Makefile.in
View File

@ -1137,7 +1137,7 @@ modwipe:
install_mod: modules install_mod: modules
@echo Installing $(NAME) @echo Installing $(NAME)
@mkdir -p $(PREFIX) $(PREFIX)/conf $(PREFIX)/mod $(PREFIX)/db $(PREFIX)/log $(PREFIX)/bin $(PREFIX)/scripts $(PREFIX)/htdocs $(PREFIX)/grammar @mkdir -p $(PREFIX) $(PREFIX)/conf $(PREFIX)/mod $(PREFIX)/db $(PREFIX)/log $(PREFIX)/bin $(PREFIX)/scripts $(PREFIX)/htdocs $(PREFIX)/grammar
@if [ ! -f $(PREFIX)/conf/freeswitch.xml ] ; then /bin/cp -p conf/freeswitch.xml $(PREFIX)/conf/; fi @if [ ! -f $(PREFIX)/conf/freeswitch.xml ] ; then /bin/cp -p conf/*.xml $(PREFIX)/conf/; fi
@if [ -f .libs/$(NAME) ] ; then /bin/cp -p .libs/$(NAME) $(PREFIX)/bin ; else /bin/cp -p ./$(NAME) $(PREFIX)/bin ; fi @if [ -f .libs/$(NAME) ] ; then /bin/cp -p .libs/$(NAME) $(PREFIX)/bin ; else /bin/cp -p ./$(NAME) $(PREFIX)/bin ; fi
@echo Installing Modules @echo Installing Modules
@rm -f build/freeswitch.env @rm -f build/freeswitch.env

6
src/switch_xml.c
View File

@ -886,11 +886,11 @@ static int preprocess(const char *file, int new_fd, int rlevel)
} }
if ((cmd = strstr(bp, "<!--#"))) { if ((cmd = strstr(bp, "<!--#"))) {
write(new_fd, bp, cmd - bp); write(new_fd, bp, (unsigned)(cmd - bp));
if ((e = strstr(cmd, "-->"))) { if ((e = strstr(cmd, "-->"))) {
*e = '\0'; *e = '\0';
e += 3; e += 3;
write(new_fd, e, strlen(e)); write(new_fd, e, (unsigned)strlen(e));
} else { } else {
ml++; ml++;
} }
@ -947,7 +947,7 @@ static int preprocess(const char *file, int new_fd, int rlevel)
continue; continue;
} }
write(new_fd, bp, cur); write(new_fd, bp, (unsigned)cur);
} }
close(old_fd); close(old_fd);