Attachment 8363 Details for Bug 9512 – proposed fix 2

[patch] proposed fix 2

0001-wafsamba-use-additional-xml-catalog-file-bug-9512.patch (text/plain), 1.30 KB, created by Björn Baumbach on 2012-12-21 10:13:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Baumbach

Created: 2012-12-21 10:13:20 UTC

Size: 1.30 KB

patch

obsolete

>From 739c06745aa812fd80700ce28b61c684ff03449c 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: use additional xml catalog file (bug #9512)
>
>Add additional "/usr/local/share/xml/catalog" catalog file
>platforms (used by freebsd).
>Fix manual page build on freebsd (bug #9512)
>---
> buildtools/wafsamba/wafsamba.py |    3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
>diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
>index 9409669..c49f7aa 100644
>--- a/buildtools/wafsamba/wafsamba.py
>+++ b/buildtools/wafsamba/wafsamba.py
>@@ -790,7 +790,8 @@ 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'
>+    bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file:///usr/local/share/xml/catalog 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
>

Actions: View

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