Attachment 8277 Details for Bug 9459 – v4-0-test patch

[patch] v4-0-test patch

0001-BUG-9459-Install-manpages-only-if-we-install-the-tar.patch (text/plain), 2.17 KB, created by Andreas Schneider on 2012-12-04 17:24:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2012-12-04 17:24:55 UTC

Size: 2.17 KB

patch

obsolete

>From 100c79514b79611a179514dd01d7b25093cdc330 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 4 Dec 2012 15:03:40 +0100
>Subject: [PATCH] BUG 9459: Install manpages only if we install the target.
>
>Reviewed-by: Alexander Bokovoy <ab@samba.org>
>
>Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
>Autobuild-Date(master): Tue Dec  4 18:07:47 CET 2012 on sn-devel-104
>(cherry picked from commit 2ad562057a6d2f19056e90ece9b7c8be396e4662)
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> buildtools/wafsamba/wafsamba.py | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
>diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
>index 59d3a2c..9409669 100644
>--- a/buildtools/wafsamba/wafsamba.py
>+++ b/buildtools/wafsamba/wafsamba.py
>@@ -287,7 +287,7 @@ def SAMBA_LIBRARY(bld, libname, source,
> 
>     if (manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and
>         bld.env['XSLTPROC_MANPAGES']):
>-        bld.MANPAGES(manpages)
>+        bld.MANPAGES(manpages, install)
> 
> 
> Build.BuildContext.SAMBA_LIBRARY = SAMBA_LIBRARY
>@@ -383,7 +383,7 @@ def SAMBA_BINARY(bld, binname, source,
>         )
> 
>     if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
>-        bld.MANPAGES(manpages)
>+        bld.MANPAGES(manpages, install)
> 
> Build.BuildContext.SAMBA_BINARY = SAMBA_BINARY
> 
>@@ -771,7 +771,7 @@ def INSTALL_DIRS(bld, destdir, dirs):
> Build.BuildContext.INSTALL_DIRS = INSTALL_DIRS
> 
> 
>-def MANPAGES(bld, manpages):
>+def MANPAGES(bld, manpages, install):
>     '''build and install manual pages'''
>     bld.env.MAN_XSL = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'
>     for m in manpages.split():
>@@ -782,7 +782,8 @@ def MANPAGES(bld, manpages):
>                             group='final',
>                             rule='${XSLTPROC} --xinclude -o ${TGT} --nonet ${MAN_XSL} ${SRC}'
>                             )
>-        bld.INSTALL_FILES('${MANDIR}/man%s' % m[-1], m, flat=True)
>+        if install:
>+            bld.INSTALL_FILES('${MANDIR}/man%s' % m[-1], m, flat=True)
> Build.BuildContext.MANPAGES = MANPAGES
> 
> def SAMBAMANPAGES(bld, manpages):
>-- 
>1.8.0.1
>

Flags:

ab: review+

Actions: View

Attachments on bug 9459: 8277