ctdb/wscript: Avoid installing pre-built man pages which does not exist during make

[Amitay Isaacs]

On Tue, Nov 10, 2015 at 3:21 PM, Martin Schwenke <martin at meltin.net> wrote:

> On Mon, 9 Nov 2015 15:52:27 +0100, Michael Adam <obnox at samba.org> wrote:
>
> > On 2015-11-09 at 18:13 +0530, Anoop C S wrote:
>
> > > When samba is compiled from source with-cluster-support, make fails
> > > with the following warning in the absence of xsltproc:
> > >
> > > input file 'doc/ctdb.1' could not be found ('/root/samba/ctdb')
> > >
> > > This is because in ctdb/wscript we try to install pre-built ctdb man
> > > pages which does not exist under ctdb/doc if XSLTPROC_MANPAGES is not
> > > set during configure as follows:
> > >
> > > if 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
> > >     bld.MANPAGES('''onnode.1 ctdbd_wrapper.1 ctdbd.conf.5
> > >                  ctdb.7 ctdb-statistics.7 ctdb-tunables.7''',
> > >                  True)
> > > else:
> > >     for m in manpages:
> > >         bld.SAMBA_GENERATOR(m,
> > >                          source=os.path.join("doc", m),
> > >                          target=m,
> > >                          rule='sed %s ${SRC} > ${TGT}' % (sed_cmdline))
> > >         bld.INSTALL_FILES('${MANDIR}/man%s' % m[-1], m)
> > >
> > > On a fedora 23 machine docbook-style-xsl provides the necessary style
> > > sheets to convert xml docs to required formats.
> > >
> > > Attached is a patch which reverts the commit 3ddd3514 which introduced
> > > this else part in ctdb/wscript. Many thanks to Michael who helped me in
> > > finding the root cause.
> >
> > Reviewed-by: me.
> >
> > The reverted patch reads 'Install pre-built manpages ...'
> > But there are no pre-built manpages any more since
> >
> > 56e1d523a538bbd2434a37415605fb6a23d39706
> > "doc: Do not keep the built version of manpages in version control"
> > (Oct 22, 2012)
>
> There are pre-built manpages in a tarball.  I don't think a revert here
> is the right thing to do.  The original commit fixed a bug where the
> pre-built manpages for a tarball do not get installed.  It introduced a
> new bug that isn't very hard to fix.
>
> Perhaps I'm being precious because it is my commit being reverted?
> However, what about the attached patch instead?  It even handles the
> case where someone has done something strange and a subset of the
> pre-built manpages are available.  :-)
>
> peace & happiness,
> martin
>

Reviewed-by: me

I will wait till Ralph's autobuild is either canceled or goes through.  If
the autobuild goes through, then I will push revert or a revert.

Amitay.