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

[apache] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 4f6e83e6a6a1ba91224b7c23cdd8f6e38661a146..6d8a23daca0c6c564ab08521f370dd472b0cead6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -76,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 
@@ -83,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); \
@@ -151,7 +158,7 @@ install-include:
        @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)
@@ -173,6 +180,6 @@ install-suexec:
        fi
 
 suexec:
-       cd support && make suexec
+       cd support && $(MAKE) suexec
 
 include $(top_srcdir)/os/os2/core.mk