From 8ea9098760ad042be9f049dcb4d17bf250335948 Mon Sep 17 00:00:00 2001
From: Petr Kovar <pkovar@redhat.com>
Date: Jul 24 2013 13:55:21 +0000
Subject: Bug 966467 - man path


---

diff --git a/en-US/Packaging_Software_Collections.xml b/en-US/Packaging_Software_Collections.xml
index 9ebc61d..2dfc397 100644
--- a/en-US/Packaging_Software_Collections.xml
+++ b/en-US/Packaging_Software_Collections.xml
@@ -637,7 +637,7 @@ install -p -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{?scl:%_root_sysconfdir}%{!?scl:
     <title>&DSCL; manpath Support</title>
     <para>To allow the <command>man</command> command on the system to display manual pages from the enabled &DSCL;, update the <envar>MANPATH</envar> environment variable with the paths to the manual pages that are associated with the &DSCL;.</para>
     <para>To update the <envar>MANPATH</envar> environment variable, add the following line to the spec file:</para>
-    <programlisting language="RPM Spec">export MANPATH=${MANPATH:+${MANPATH}:}%{_mandir}</programlisting>
+    <programlisting language="RPM Spec">export MANPATH=%{_mandir}:\${MANPATH}</programlisting>
     <para>This update relocates the <code>%{_mandir}</code> macro to the &DSCL; path. So that the manual pages associated with the &DSCL; are not visible as long as the &DSCL; is not enabled.</para>
     <para>The &DSCL; can provide a wrapper script that is visible to the system to enable the &DSCL;, for example in the <filename>/usr/bin/</filename> directory. In this case, ensure that the manual pages are visible to the system even if the &DSCL; is disabled.</para>
     <para>To allow the <command>man</command> command on the system to display manual pages from the disabled &DSCL;, update the <envar>MANPATH</envar> environment variable with the paths to the manual pages associated with the &DSCL;.</para>
@@ -647,7 +647,7 @@ install -p -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{?scl:%_root_sysconfdir}%{!?scl:
     <screen>%{?scl_prefix}manpage.sh</screen></step>
     <step>
     <para>Use the <filename>manpage.sh</filename> short script that modifies the <envar>MANPATH</envar> variable to refer to your man path directory:</para>
-    <screen>export MANPATH=${MANPATH:+${MANPATH}:}/&OPT;/<replaceable>&RH;</replaceable>/<replaceable>software_collection/path/to/your/man_pages</replaceable></screen>
+    <screen>export MANPATH=/&OPT;/<replaceable>&RH;</replaceable>/<replaceable>software_collection/path/to/your/man_pages</replaceable>:${MANPATH}</screen>
     </step>
     <step><para>Add the file to your &DSCL; package's spec file:</para>
     <programlisting language="RPM Spec">SOURCE2: %{?scl_prefix}manpage.sh</programlisting></step>