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

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4027 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/Makefile.am b/Makefile.am
index f11c2512b153f64faf5de5d30825596271e1049d..59fe752bd6950a3f75f6a856eb5dc19ecc8976a7 100644 (file)
--- 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 b7e9d47f9ed474a34d6d6ae66a7c2103b322b54a..d9135dc57691881749840fb3b15bd90b4e0df15e 100644 (file)
--- 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 ff79effb2c80de2f788103374894488ce76323c0..44126125be9da6f6d15dd7a97636103989bc818e 100644 (file)
--- 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, "<!--#"))) {
-            write(new_fd, bp, cmd - bp);
+            write(new_fd, bp, (unsigned)(cmd - bp));
             if ((e = strstr(cmd, "-->"))) {
                 *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);