VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-07-29 12:37:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Rainer Jung
2011-11-11 02:32:19 +00:00
parent 02d93987f1
commit 67b5ac9664
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -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`; \

1
NWGNUmakefile
View File

@ -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)

1
build/installwinconf.awk
View File

@ -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 ) {