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

[Michael Adam]

On 2015-11-09 at 18:13 +0530, Anoop C S wrote:
> Hi,
> 
> 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)

Michael


> From 317dd4f9258c016b06be9f3fb32cae0bf2af1606 Mon Sep 17 00:00:00 2001
> From: Anoop C S <anoopcs at redhat.com>
> Date: Mon, 9 Nov 2015 18:06:35 +0530
> Subject: [PATCH] Revert "ctdb-build: Install pre-built manpages when xsltproc
>  not available"
> 
> This reverts commit 3ddd35142ab86de431d00f93de2fb6a2b371317d.
> 
> Since we no longer have pre-built man pages under ctdb/doc we can get rid
> of trying to install the same during make which will error out with the
> following:
> 
> input file 'doc/ctdb.1' could not be found ('/root/samba/ctdb')
> ---
>  ctdb/wscript | 7 -------
>  1 file changed, 7 deletions(-)
> 
> diff --git a/ctdb/wscript b/ctdb/wscript
> index b720748..853ebd8 100755
> --- a/ctdb/wscript
> +++ b/ctdb/wscript
> @@ -497,13 +497,6 @@ def build(bld):
>          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)
>  
>      bld.SAMBA_GENERATOR('ctdb-onnode',
>                          source='tools/onnode',
> -- 
> 2.5.0
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20151109/293d3b85/signature.sig>