From: Jim Jagielski <jim@apache.org>
Date: Fri, 11 Nov 2011 17:25:11 +0000 (+0000)
Subject: Merge r1200699 from trunk:
X-Git-Tag: 2.3.16~199
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f184506d7ae4921d34784363f423479cc8c9295b;p=apache

Merge r1200699 from trunk:

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.

Submitted by: rjung
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1200973 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/Makefile.in b/Makefile.in
index ca5e806c7c..e5d75c8ac2 100644
--- 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 f120e85b1c..732935bce4 100644
--- 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 ec2d2327fd..7e7718607b 100644
--- 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 ) {