diff options
| author | Jim Jagielski <jim@apache.org> | 2011-11-11 17:25:11 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2011-11-11 17:25:11 +0000 |
| commit | f184506d7ae4921d34784363f423479cc8c9295b (patch) | |
| tree | 679f1fb59245a64caff172ea2492ee6d6560bb5d /NWGNUmakefile | |
| parent | c0d6def62a0716a8999e6595508bf27b6b898685 (diff) | |
| download | httpd-f184506d7ae4921d34784363f423479cc8c9295b.tar.gz | |
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
Diffstat (limited to 'NWGNUmakefile')
| -rw-r--r-- | NWGNUmakefile | 1 |
1 files changed, 1 insertions, 0 deletions
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) |