build/8851: HTML manuals aren't installed in $manualdir.

[Yoshifumi Hiramatsu <hi...@boreas.dti.ne.jp>]

>Number:         8851
>Category:       build
>Synopsis:       HTML manuals aren't installed in $manualdir.
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    apache
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   apache
>Arrival-Date:   Fri Nov 23 23:10:00 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     hiramatu@boreas.dti.ne.jp
>Release:        2_0_28
>Organization:
apache
>Environment:
NetBSD ragout.my.domain 1.5.2 NetBSD 1.5.2 (Ragout) #1: Mon Nov 19 06:30:24 JST 2001     root@ragout.my.domain:/usr/src/sys/arch/i386/compile/Ragout i386
>Description:
$manualdir in config.layout is ignored. For example, using following layout and

# ./configure --prefix=/tmp/apache2 --enable-layout=NetBSD
# make
# make install

installs manual pages in /tmp/apache2/manual, while layout points /tmp/apache2/share/httpd/manual.

<Layout NetBSD>
    prefix:        /tmp/apache2
    exec_prefix:   $prefix
    bindir:        $prefix/bin
    sbindir:       $prefix/sbin
    libexecdir:    $prefix/lib/httpd
    mandir:        $prefix/man
    sysconfdir:    $prefix/etc/httpd
    datadir:       $prefix/share/httpd
    installbuilddir: $datadir/build
    errordir:      $datadir/error
    iconsdir:      $datadir/icons
    htdocsdir:     $datadir/htdocs
    manualdir:     $datadir/manual
    cgidir:        $prefix/libexec/cgi-bin
    includedir:    $prefix/include/httpd
    localstatedir: /var
    runtimedir:    /var/run
    logfiledir:    /var/log/httpd
    proxycachedir: /var/spool/httpd/proxy
</Layout>
>How-To-Repeat:

>Fix:
--- acinclude.m4.orig   Sat Nov 24 15:42:19 2001
+++ acinclude.m4        Sat Nov 24 15:42:47 2001
@@ -295,7 +295,7 @@
   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
       *+)


--- Makefile.in.orig  Sat Nov 24 15:43:28 2001
+++ Makefile.in Sat Nov 24 15:51:46 2001
@@ -95,8 +95,8 @@
        @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:

>Release-Note:
>Audit-Trail:
>Unformatted:
 [In order for any reply to be added to the PR database, you need]
 [to include <ap...@Apache.Org> in the Cc line and make sure the]
 [subject line starts with the report component and number, with ]
 [or without any 'Re:' prefixes (such as "general/1098:" or      ]
 ["Re: general/1098:").  If the subject doesn't match this       ]
 [pattern, your message will be misfiled and ignored.  The       ]
 ["apbugs" address is not added to the Cc line of messages from  ]
 [the database automatically because of the potential for mail   ]
 [loops.  If you do not include this Cc, your reply may be ig-   ]
 [nored unless you are responding to an explicit request from a  ]
 [developer.  Reply only with text; DO NOT SEND ATTACHMENTS!     ]