Fix the installation target to make sure that the manual is

installed in the correct location.

PR:	8851
Submitted by:	Yoshifumi Hiramatsu <hiramatu@boreas.dti.ne.jp>
                and Gomez Henri <hgomez@slib.fr>

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

diff --git a/CHANGES b/CHANGES
index fa9437ed031d63252c7515c6b2f56198e4e2ac42..34718cc68599fb275cd2e346fc1517e947df494f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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 31ef41884e6bc28fd3d1c28616bd699b95bc881a..4f6e83e6a6a1ba91224b7c23cdd8f6e38661a146 100644 (file)
--- 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 4def54d3302a226b2ab1bc73296fc2bb71ee7067..2057f2b441d22104b3146c55ee2628f9fa578d11 100644 (file)
--- 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
       *+)