[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Tue Dec 4 10:08:05 MST 2012
The branch, master has been updated
via 2ad5620 BUG 9459: Install manpages only if we install the target.
from 1c5c492 Remove unused append_parent_acl().
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2ad562057a6d2f19056e90ece9b7c8be396e4662
Author: Andreas Schneider <asn at samba.org>
Date: Tue Dec 4 15:03:40 2012 +0100
BUG 9459: Install manpages only if we install the target.
Reviewed-by: Alexander Bokovoy <ab at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Tue Dec 4 18:07:47 CET 2012 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/wafsamba.py | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
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):
--
Samba Shared Repository
More information about the samba-cvs
mailing list