diff --git a/Makefile.am b/Makefile.am index f11c2512b1..59fe752bd6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -199,7 +199,7 @@ modwipe: install_mod: modules @echo Installing $(NAME) @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 @echo Installing Modules @rm -f build/freeswitch.env diff --git a/Makefile.in b/Makefile.in index b7e9d47f9e..d9135dc576 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1137,7 +1137,7 @@ modwipe: install_mod: modules @echo Installing $(NAME) @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 @echo Installing Modules @rm -f build/freeswitch.env diff --git a/src/switch_xml.c b/src/switch_xml.c index ff79effb2c..44126125be 100644 --- a/src/switch_xml.c +++ b/src/switch_xml.c @@ -886,11 +886,11 @@ static int preprocess(const char *file, int new_fd, int rlevel) } if ((cmd = strstr(bp, ""))) { *e = '\0'; e += 3; - write(new_fd, e, strlen(e)); + write(new_fd, e, (unsigned)strlen(e)); } else { ml++; } @@ -947,7 +947,7 @@ static int preprocess(const char *file, int new_fd, int rlevel) continue; } - write(new_fd, bp, cur); + write(new_fd, bp, (unsigned)cur); } close(old_fd);