Fix installation of conf/extra/proxy-html.conf.

Otherwise httpd does no longer start, because
it is the only extra file required in the main
config at the moment.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200699 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Makefile.in b/Makefile.in
index ca5e806c7c29e0f1d930bb13698b87739a838993..e5d75c8ac272c248270a309a7e3e59f28d9d272a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,7 +41,7 @@ install-conf:
        done; \
        for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
            cd $$j ; \
-           for i in httpd.conf extra/httpd-*.conf; do \
+           for i in httpd.conf extra/*.conf; do \
                if [ -f $$i ] ; then \
                ( \
                        n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \

diff --git a/NWGNUmakefile b/NWGNUmakefile
index f120e85b1c937449f2ed1b1793790fd5302eaa19..732935bce402e6579872e4ee1e29ff384540b931 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -416,6 +416,7 @@ install :: nlms instscripts FORCE
        $(call MKCNF,docs/conf/extra/httpd-userdir.conf.in,            $(INSTALLBASE)/conf/extra/httpd-userdir.conf)
        $(call MKCNF,docs/conf/extra/httpd-vhosts.conf.in,             $(INSTALLBASE)/conf/extra/httpd-vhosts.conf)
        $(call MKCNF,docs/conf/extra/httpd-ssl.conf.in,                $(INSTALLBASE)/conf/extra/httpd-ssl.conf)
+       $(call MKCNF,docs/conf/extra/proxy-html.conf.in,                $(INSTALLBASE)/conf/extra/proxy-html.conf)
        $(call COPYR,docs/docroot,                                     $(INSTALLBASE)/htdocs)
        $(call COPYR,docs/error,                                       $(INSTALLBASE)/error)
        $(call COPYR,docs/icons,                                       $(INSTALLBASE)/icons)

diff --git a/build/installwinconf.awk b/build/installwinconf.awk
index ec2d2327fdc3a9efdb12c1b16d4d8fe0f508025e..7e7718607bceddfd145258115b1b86a33bfda86a 100644 (file)
--- a/build/installwinconf.awk
+++ b/build/installwinconf.awk
@@ -66,6 +66,7 @@ BEGIN {
     filelist["httpd-ssl.conf"] = "httpd-ssl.conf.in";
     filelist["httpd-userdir.conf"] = "httpd-userdir.conf.in";
     filelist["httpd-vhosts.conf"] = "httpd-vhosts.conf.in";
+    filelist["proxy-html.conf"] = "proxy-html.conf.in";
 
     for ( conffile in filelist ) {