PR 39313: allow the user to configure which rules come first when RewriteRules

[apache] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 6cfe9639adf6c3a9e3c46d68b5c59cfde3359f23..d16e0580846dc6ae6cbbc5c3653aba012f378224 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,6 +19,7 @@ INSTALL_TARGETS = install-conf install-htdocs install-error install-icons \
        install-man
 
 DISTCLEAN_TARGETS  = include/ap_config_auto.h include/ap_config_layout.h \
+       include/apache_probes.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/config_vars.sh
@@ -47,12 +48,14 @@ install-conf:
                        if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
                                sed -e 's#@@ServerRoot@@#$(prefix)#g' \
                                        -e 's#@@Port@@#$(PORT)#g' \
+                                       -e 's#@@SSLPort@@#$(SSLPORT)#g' \
                                        -e '/@@LoadModule@@/d' \
                                        < $$i; \
                        else \
                                sed -n -e '/@@LoadModule@@/q' \
                                        -e 's#@@ServerRoot@@#$(prefix)#g' \
                                        -e 's#@@Port@@#$(PORT)#g' \
+                                       -e 's#@@SSLPort@@#$(SSLPORT)#g' \
                                        -e 'p' \
                                        < $$i; \
                                for j in $(DSO_MODULES) "^EOL^"; do \
@@ -64,6 +67,7 @@ install-conf:
                                        -e '/@@LoadModule@@/d' \
                                        -e 's#@@ServerRoot@@#$(prefix)#g' \
                                        -e 's#@@Port@@#$(PORT)#g' \
+                                       -e 's#@@SSLPort@@#$(SSLPORT)#g' \
                                        < $$i; \
                        fi \
                ) > $(DESTDIR)$(sysconfdir)/original/$$i; \
@@ -178,15 +182,20 @@ INSTALL_HEADERS = \
        include/*.h \
        $(srcdir)/include/*.h \
        $(srcdir)/os/$(OS_DIR)/os.h \
-       $(srcdir)/server/mpm/$(MPM_SUBDIR_NAME)/*.h \
-       $(srcdir)/modules/aaa/mod_auth.h \
+       $(srcdir)/modules/arch/unix/mod_unixd.h \
+       $(srcdir)/modules/core/mod_so.h \
+       $(srcdir)/modules/core/mod_watchdog.h \
+       $(srcdir)/modules/cache/mod_cache.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 \
        $(srcdir)/modules/generators/mod_status.h \
        $(srcdir)/modules/loggers/mod_log_config.h \
-       $(srcdir)/modules/http/mod_core.h \
+       $(srcdir)/modules/mappers/mod_rewrite.h \
        $(srcdir)/modules/proxy/mod_proxy.h \
+       $(srcdir)/modules/proxy/mod_serf.h \
+        ${srcdir}/modules/session/mod_session.h \
        $(srcdir)/modules/ssl/mod_ssl.h \
        $(srcdir)/os/$(OS_DIR)/*.h
 
@@ -209,7 +218,7 @@ install-man:
          $(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; \
+         cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
        fi
 
 install-suexec:
@@ -225,4 +234,5 @@ suexec:
 x-local-distclean:
        @rm -rf autom4te.cache
 
+# XXX: This looks awfully platform-specific [read: bad form and style]
 include $(top_srcdir)/os/os2/core.mk