note that rewrite map expansions work in rewriteconds

[apache] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index d054c669be12eefedf0076cf86d7710a06296951..1da5a0fbecad20c4add0c7107a22e045e21f29ff 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 
-SUBDIRS = modules os server srclib support test
+SUBDIRS = srclib modules os server support
 
 PROGRAM_NAME         = $(progname)
 PROGRAM_SOURCES      = modules.c
@@ -12,13 +12,14 @@ PROGRAM_DEPENDENCIES = \
   $(AP_LIBS)
 
 PROGRAMS        = $(PROGRAM_NAME)
-targets         = $(PROGRAMS)
+targets         = $(PROGRAMS) 
 phony_targets   = $(srcdir)/buildmark.c
 install_targets = install-conf install-htdocs install-icons install-other \
-       install-cgi install-include install-support
-DISTCLEANFILES  = include/config_auto.h modules.c aclocal.m4 buildmk.stamp \
+       install-cgi install-include install-support install-suexec
+DISTCLEAN_TARGETS  = include/config_auto.h modules.c aclocal.m4 buildmk.stamp \
        configure generated_lists include/ap_config_auto.h \
-       include/ap_config_auto.h.in include/ap_config_path.h install-sh
+       include/ap_config_auto.h.in include/ap_config_path.h install-sh \
+       missing mkinstalldirs
 
 include $(top_srcdir)/build/rules.mk
 include $(top_srcdir)/build/program.mk
@@ -26,16 +27,16 @@ include $(top_srcdir)/build/program.mk
 install-conf:
        @echo Installing configuration files
        @test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
-       @cd $(srcdir)/../conf; \
+       @cd docs/conf; \
        for i in mime.types magic; do \
                $(INSTALL_DATA) $$i $(sysconfdir); \
        done; \
-       for i in *-dist; do \
+       for i in *-std*; do \
                sed -e 's#@@ServerRoot@@#$(prefix)#g' \
                    -e 's#@@Port@@#$(PORT)#g' \
                        < $$i > $(sysconfdir)/$$i; \
                chmod 0644 $(sysconfdir)/$$i; \
-               file=`echo $$i|sed s/-dist//`; \
+               file=`echo $$i|sed s/-std//`; \
                if [ "$$file" = "httpd.conf" ]; then \
                        file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
                fi; \
@@ -44,7 +45,7 @@ install-conf:
                fi; \
        done
 
-htdocs-srcdir = $(srcdir)/../htdocs
+htdocs-srcdir = docs/docroot
 
 docs: include/*.h
        mkdir -p ./docs/api
@@ -54,16 +55,21 @@ install-htdocs:
        @echo Installing HTML documents
        @test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
        @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
+       @test -d $(htdocsdir)/manual || $(MKINSTALLDIRS) $(htdocsdir)/manual
+       @test -d docs/manual && (cd docs/manual && cp -rp * $(htdocsdir)/manual)
+       @(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
 
 install-icons:
        @echo Installing icons
        @test -d $(iconsdir) || $(MKINSTALLDIRS) $(iconsdir)
-       @(cd $(srcdir)/../icons && cp -rp * $(iconsdir))
+       @(cd docs/icons && cp -rp * $(iconsdir))
+       @(cd $(iconsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
 
 install-cgi:
        @echo Installing CGIs
        @test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
-       @(cd $(srcdir)/../cgi-bin && cp -rp * $(cgidir))
+       @(cd docs/cgi-examples && cp -rp * $(cgidir))
+       @(cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;)
 
 install-support:
        @echo Installing Support Binaries
@@ -94,14 +100,24 @@ install-other:
 install-include:
        @echo Installing header files
        @test -d $(includedir)     || $(MKINSTALLDIRS) $(includedir)
-       @test -d $(includedir)/xml || $(MKINSTALLDIRS) $(includedir)/xml
-       @test -d $(includedir)/apr || $(MKINSTALLDIRS) $(includedir)/apr
        @cp -p include/*.h $(srcdir)/include/*.h $(includedir)
        @cp -p $(srcdir)/os/$(OS_DIR)/os.h $(includedir)
        @if test -f $(srcdir)/os/$(OS_DIR)/os-inline.c; then \
             cp -p $(srcdir)/os/$(OS_DIR)/os-inline.c $(includedir); \
         fi;
        @cp -p $(srcdir)/modules/dav/main/mod_dav.h $(includedir)
-       @cp -p $(srcdir)/srclib/expat-lite/*.h $(includedir)/xml
-       @cp -p srclib/apr/include/*.h $(srcdir)/srclib/apr/include/*.h $(includedir)/apr
-       @chmod 644 $(includedir)/*.h $(includedir)/xml/*.h $(includedir)/apr/*.h
+       @cp -p $(srcdir)/modules/filters/mod_include.h $(includedir)
+       @cp -p $(srcdir)/srclib/expat-lite/*.h $(includedir)
+       @cp -p $(srcdir)/srclib/pcre/*.h $(includedir)
+       @cp -p $(srcdir)/srclib/apr/include/*.h $(includedir)
+       @cp -p $(srcdir)/srclib/apr-util/include/*.h $(includedir)
+       @chmod 644 $(includedir)/*.h
+
+install-suexec:
+       @if test -f $(builddir)/support/suexec; then \
+           $(MKINSTALLDIRS) -p $(bindir)/sbin; \
+           cp -p $(srcdir)/support/suexec $(bindir)/sbin; \
+       fi
+
+suexec:
+       cd support && make suexec