From 095f4c8199e609b572418e0821343bbc9c7b879f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= <ovasik@redhat.com>
Date: Tue, 6 Sep 2011 17:42:29 +0200
Subject: [PATCH] revert previous change, workaround the mandir links issue in
 buildroot (#727251)

---
 docbook-xsl-defaultparams.patch | 12 ------------
 docbook-xsl-mandir.patch        | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 12 deletions(-)
 delete mode 100644 docbook-xsl-defaultparams.patch
 create mode 100644 docbook-xsl-mandir.patch

diff --git a/docbook-xsl-defaultparams.patch b/docbook-xsl-defaultparams.patch
deleted file mode 100644
index 43fe7ac..0000000
--- a/docbook-xsl-defaultparams.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp docbook-xsl-1.76.1-orig/manpages/param.xsl docbook-xsl-1.76.1/manpages/param.xsl
---- docbook-xsl-1.76.1-orig/manpages/param.xsl	2010-11-01 21:06:06.000000000 +0100
-+++ docbook-xsl-1.76.1/manpages/param.xsl	2011-08-29 16:00:11.330244543 +0200
-@@ -80,7 +80,7 @@ or
- <xsl:param name="man.justify">0</xsl:param>
- <xsl:param name="man.output.base.dir">man/</xsl:param>
- <xsl:param name="man.output.encoding">UTF-8</xsl:param>
--<xsl:param name="man.output.in.separate.dir" select="0"/>
-+<xsl:param name="man.output.in.separate.dir" select="1"/>
- <xsl:param name="man.output.lang.in.name.enabled" select="0"/>
- <xsl:param name="man.output.manifest.enabled" select="0"/>
- <xsl:param name="man.output.manifest.filename">MAN.MANIFEST</xsl:param>
diff --git a/docbook-xsl-mandir.patch b/docbook-xsl-mandir.patch
new file mode 100644
index 0000000..d2c5a7e
--- /dev/null
+++ b/docbook-xsl-mandir.patch
@@ -0,0 +1,19 @@
+diff -urNp docbook-xsl-1.76.1-orig/manpages/other.xsl docbook-xsl-1.76.1/manpages/other.xsl
+--- docbook-xsl-1.76.1-orig/manpages/other.xsl	2010-08-27 05:14:52.000000000 +0200
++++ docbook-xsl-1.76.1/manpages/other.xsl	2011-09-06 17:17:07.973737258 +0200
+@@ -595,7 +595,14 @@ manvolnum
+           <xsl:with-param name="message-prolog">Note: </xsl:with-param>
+           <xsl:with-param name="message-epilog"> (soelim stub)</xsl:with-param>
+           <xsl:with-param name="content">
+-            <xsl:value-of select="'.so '"/>
++            <xsl:choose>
++              <xsl:when test="$man.output.in.separate.dir = 0">
++              <xsl:value-of select="concat('.so man', $section, '/')"/>
++              </xsl:when>
++              <xsl:otherwise>
++              <xsl:value-of select="'.so '"/> <!-- added case -->
++              </xsl:otherwise>
++              </xsl:choose>
+             <xsl:call-template name="make.adjusted.man.filename">
+               <xsl:with-param name="name" select="$first.refname"/>
+               <xsl:with-param name="section" select="$section"/>