Fix RedirectMatch so it won't emit invalid Location fields.

[apache] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 6c66c8a00213532c833b4549226d7870bae66341..6d8a23daca0c6c564ab08521f370dd472b0cead6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -34,10 +34,39 @@ install-conf:
        for i in mime.types magic; do \
                $(INSTALL_DATA) $$i $(sysconfdir); \
        done; \
-       for i in *-std*; do \
-               sed -e 's#@@ServerRoot@@#$(prefix)#g' \
-                   -e 's#@@Port@@#$(PORT)#g' \
-                       < $$i > $(sysconfdir)/$$i; \
+       for i in *-std* ssl.conf; do \
+               [ -f $$i ] || continue; \
+               ( \
+                       n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
+                       if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
+                               sed -e 's#@@ServerRoot@@#$(prefix)#g' \
+                                       -e 's#@@Port@@#$(PORT)#g' \
+                                       -e '/@@LoadModule@@/d' \
+                                       < $$i; \
+                       else \
+                               sed -n -e '/@@LoadModule@@/q' \
+                                       -e 's#@@ServerRoot@@#$(prefix)#g' \
+                                       -e 's#@@Port@@#$(PORT)#g' \
+                                       -e 'p' \
+                                       < $$i; \
+                               for j in $(DSO_MODULES) "^EOL^"; do \
+                                       if test "x$$j" = "xssl"; then \
+                                               echo "<IfDefine SSL>"; \
+                                       fi; \
+                                       if test $$j != "^EOL^"; then \
+                                               echo "LoadModule $${j}_module modules/mod_$${j}.so"; \
+                                       fi; \
+                                       if test "x$$j" = "xssl"; then \
+                                               echo "</IfDefine>"; \
+                                       fi; \
+                               done; \
+                               sed -e '1,/@@LoadModule@@/d' \
+                                       -e '/@@LoadModule@@/d' \
+                                       -e 's#@@ServerRoot@@#$(prefix)#g' \
+                                       -e 's#@@Port@@#$(PORT)#g' \
+                                       < $$i; \
+                       fi \
+               ) > $(sysconfdir)/$$i; \
                chmod 0644 $(sysconfdir)/$$i; \
                file=`echo $$i|sed s/-std//`; \
                if [ "$$file" = "httpd.conf" ]; then \
@@ -47,6 +76,12 @@ install-conf:
                        $(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \
                fi; \
        done
+       @if test -f "$(builddir)/envvars-std"; then \
+           cp -p envvars-std $(sbindir); \
+           if test ! -f $(sbindir)/envvars; then \
+               cp -p envvars-std $(sbindir)/envvars ; \
+           fi ; \
+       fi
 
 install-build:
        @echo Installing build system files 
@@ -54,6 +89,7 @@ install-build:
        @sed 's#LIBTOOL = \(.*\)#LIBTOOL = $(SHELL) $(installbuilddir)/libtool $(LTFLAGS)#' \
            config_vars.mk > $(installbuilddir)/config_vars.mk; \
        cp build/*.mk $(installbuilddir); \
+       cp $(top_srcdir)/build/instdso.sh $(installbuilddir); \
        cp srclib/apr/libtool $(installbuilddir); \
        if test -f srclib/apr/shlibtool; then \
            cp srclib/apr/shlibtool $(installbuilddir); \
@@ -72,8 +108,8 @@ install-htdocs:
        @echo Installing HTML documents
        @test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
        @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
-       @test -d $(prefix)/manual || $(MKINSTALLDIRS) $(prefix)/manual
-       @test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(prefix)/manual)
+       @test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir)
+       @test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir))
        @(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
 
 install-error:
@@ -120,8 +156,9 @@ install-include:
        @cp -p $(srcdir)/modules/filters/mod_include.h $(includedir)
        @cp -p $(srcdir)/modules/generators/mod_cgi.h $(includedir)
        @cp -p $(srcdir)/modules/http/mod_core.h $(includedir)
+       @cp -p $(srcdir)/modules/proxy/mod_proxy.h $(includedir)
        @cp -p $(srcdir)/modules/ssl/*.h $(includedir)
-       @cp -p $(srcdir)/srclib/pcre/*.h $(includedir)
+       @cp -p $(srcdir)/srclib/pcre/pcre*.h $(includedir)
        @cp -p $(srcdir)/srclib/apr/include/*.h $(includedir)
        @cp -p $(srcdir)/srclib/apr-util/include/*.h $(includedir)
        @cp -p $(srcdir)/os/$(OS_DIR)/*.h $(includedir)
@@ -143,6 +180,6 @@ install-suexec:
        fi
 
 suexec:
-       cd support && make suexec
+       cd support && $(MAKE) suexec
 
 include $(top_srcdir)/os/os2/core.mk