Attachment 8435 Details for Bug 9512 – proposed patch cherry-picked from master

[patch] proposed patch cherry-picked from master

0001-wafsamba-fix-manual-page-build-on-freebsd-bug-9512.patch (text/plain), 1.39 KB, created by Björn Baumbach on 2013-01-15 20:18:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Baumbach

Created: 2013-01-15 20:18:58 UTC

Size: 1.39 KB

patch

obsolete

>From 0836c1f057aff7d252b3356788ab5f9ce97d2b7a Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb@sernet.de>
>Date: Thu, 20 Dec 2012 10:01:43 +0100
>Subject: [PATCH] wafsamba: fix manual page build on freebsd (bug #9512)
>
>Use "/usr/local/share/xml/catalog" as xml global catalog file on freebsd
>platforms.
>---
> buildtools/wafsamba/wafsamba.py |    7 ++++++-
> 1 files changed, 6 insertions(+), 1 deletions(-)
>
>diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
>index 9409669..0518d6b 100644
>--- a/buildtools/wafsamba/wafsamba.py
>+++ b/buildtools/wafsamba/wafsamba.py
>@@ -790,7 +790,12 @@ def SAMBAMANPAGES(bld, manpages):
>     '''build and install manual pages'''
>     bld.env.SAMBA_EXPAND_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/expand-sambadoc.xsl'
>     bld.env.SAMBA_MAN_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/man.xsl'
>-    bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
>+
>+    global_catalog_file = 'file:///etc/xml/catalog'
>+    if Utils.unversioned_sys_platform() == 'freebsd':
>+        global_catalog_file = 'file:///usr/local/share/xml/catalog'
>+    bld.env.SAMBA_CATALOGS = global_catalog_file + ' file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
>+
>     for m in manpages.split():
>         source = m + '.xml'
>         bld.SAMBA_GENERATOR(m,
>-- 
>1.7.8.6
>

Flags:

abartlet: review-

Actions: View

Attachments on bug 9512: 8358 | 8361 | 8363 | 8435 | 8436