Fix compile time warning. AJP protocol method is byte.

[apache] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index e55d1d49d9933473b6e88691d1023acd9cd3386d..bea60bef24c458fbf804331ceacb04e92c140a1d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -107,7 +107,7 @@ htdocs-srcdir = $(top_srcdir)/docs/docroot
 
 docs:
        @if test -d $(top_srcdir)/docs/manual/build; then \
-           cd $(top_srcdir)/docs/manual/build && ./build.sh; \
+           cd $(top_srcdir)/docs/manual/build && ./build.sh all; \
        else \
            echo 'For details on generating the docs, please read:'; \
            echo '  http://httpd.apache.org/docs-project/docsformat.html'; \
@@ -122,8 +122,12 @@ install-htdocs:
         else \
            echo Installing HTML documents ; \
            $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
-           test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
-           cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
+           if test -d $(htdocs-srcdir) && test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
+               $(RSYNC) --exclude .svn -rlpt --numeric-ids $(htdocs-srcdir)/ $(DESTDIR)$(htdocsdir)/; \
+           else \
+               test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
+               cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
+           fi; \
        fi
 
 install-error:
@@ -176,6 +180,7 @@ INSTALL_HEADERS = \
        $(srcdir)/os/$(OS_DIR)/os.h \
        $(srcdir)/server/mpm/$(MPM_SUBDIR_NAME)/*.h \
        $(srcdir)/modules/aaa/mod_auth.h \
+       $(srcdir)/modules/database/mod_dbd.h \
        $(srcdir)/modules/dav/main/mod_dav.h \
        $(srcdir)/modules/filters/mod_include.h \
        $(srcdir)/modules/generators/mod_cgi.h \
@@ -201,8 +206,12 @@ install-man:
        @test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
        @cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
        @cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
-       @(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
-       @(cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null ) || true
+       @if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
+         $(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \
+       else \
+         cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir); \
+         cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null; \
+       fi
 
 install-suexec:
        @if test -f $(builddir)/support/suexec; then \