Finish reverting r410758.

[apache] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index b7f2b7227bfb1b20dcecdd2cbf6e984c6ca107da..bea60bef24c458fbf804331ceacb04e92c140a1d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,7 +21,7 @@ INSTALL_TARGETS = install-conf install-htdocs install-error install-icons \
 DISTCLEAN_TARGETS  = include/ap_config_auto.h include/ap_config_layout.h \
        modules.c config.cache config.log config.status build/config_vars.mk \
        build/rules.mk docs/conf/httpd.conf docs/conf/extra/*.conf shlibtool \
-       build/pkg/pkginfo
+       build/pkg/pkginfo build/config_vars.sh
 EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in generated_lists \
        httpd.spec
 
@@ -85,25 +85,35 @@ install-conf:
            fi ; \
        fi
 
-install-build:
+# Create a sanitized config_vars.mk
+build/config_vars.out: build/config_vars.mk
+       @$(SHELL) build/config_vars.sh < build/config_vars.mk > build/config_vars.out
+
+install-build: build/config_vars.out
        @echo Installing build system files 
        @$(MKINSTALLDIRS) $(DESTDIR)$(installbuilddir) 
-       @for f in $(top_srcdir)/build/*.mk build/*.mk \
-                 $(top_builddir)/config.nice; do \
+       @for f in $(top_srcdir)/build/*.mk build/*.mk; do \
         $(INSTALL_DATA) $$f $(DESTDIR)$(installbuilddir); \
        done
-       @(INSTALL_PROGRAM) $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir)
-       @(INSTALL_PROGRAM) $(top_srcdir)/build/instdso.sh $(DESTDIR)$(installbuilddir)
-       @sed "/^LIBTOOL/s#/[^ ]*/libtool \(.*\)#`$(APR_CONFIG) --apr-libtool` $(LTFLAGS)#" \
-           build/config_vars.mk > $(DESTDIR)$(installbuilddir)/config_vars.mk
+       @for f in $(top_builddir)/config.nice \
+                 $(top_srcdir)/build/mkdir.sh \
+                 $(top_srcdir)/build/instdso.sh; do \
+        $(INSTALL_PROGRAM) $$f $(DESTDIR)$(installbuilddir); \
+       done
+       @$(INSTALL_DATA) build/config_vars.out $(DESTDIR)$(installbuilddir)/config_vars.mk
+       @rm build/config_vars.out
 
 htdocs-srcdir = $(top_srcdir)/docs/docroot
 
-docs::
-       mkdir -p ./docs/api
-       srclib/apr/build/scandoc.pl -i./build/default.pl -p./docs/api/ ./include/*.h
+docs:
+       @if test -d $(top_srcdir)/docs/manual/build; then \
+           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'; \
+       fi
 
-dox::
+dox:
        doxygen $(top_srcdir)/docs/doxygen.conf
 
 install-htdocs:
@@ -112,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:
@@ -166,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 \
@@ -191,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 \