diff options
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | acinclude.m4 | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -1,5 +1,10 @@ Changes with Apache 2.0.29-dev + *) Fix the installation target to make sure that the manual is + installed in the correct location. + [Yoshifumi Hiramatsu <hiramatu@boreas.dti.ne.jp> and + Gomez Henri <hgomez@slib.fr>] + *) Fix the cmd command for mod_include. When we are processing a cmd command, we do not want to use the r->filename to set the command name. The command comes from the SSI tag. To do this, diff --git a/Makefile.in b/Makefile.in index 31ef41884e..4f6e83e6a6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -101,8 +101,8 @@ install-htdocs: @echo Installing HTML documents @test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir) @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir)) - @test -d $(prefix)/manual || $(MKINSTALLDIRS) $(prefix)/manual - @test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(prefix)/manual) + @test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir) + @test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir)) @(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;) install-error: diff --git a/acinclude.m4 b/acinclude.m4 index 4def54d330..2057f2b441 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -295,7 +295,7 @@ AC_DEFUN(APACHE_LAYOUT,[ for var in prefix exec_prefix bindir sbindir libexecdir mandir \ sysconfdir datadir errordir iconsdir htdocsdir cgidir \ includedir localstatedir runtimedir logfiledir \ - proxycachedir installbuilddir; do + manualdir proxycachedir installbuilddir; do eval "val=\"\$$var\"" case $val in *+) |