From 068a163f7b2895afed4771a47c4caf4b9284a3fd Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Mon, 23 Feb 2015 18:11:50 +0000
Subject: [PATCH] xindy - simplify use of LC_ALL, fix backslash alignment.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@15557 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 introduction/welcome/changelog.xml | 10 ++++++++++
 pst/typesetting/xindy.xml          | 25 ++++++++++---------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 7844a0edae..ce69f192cc 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,16 @@
 
 -->
 
+    <listitem>
+      <para>February 22nd, 2015</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - simplify the LC_ALL use in xindy, I had a report that
+          it did not work for someone.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>February 22nd, 2015</para>
       <itemizedlist>
diff --git a/pst/typesetting/xindy.xml b/pst/typesetting/xindy.xml
index 2f1f54a253..d2eb1e8913 100644
--- a/pst/typesetting/xindy.xml
+++ b/pst/typesetting/xindy.xml
@@ -97,18 +97,13 @@
 
 <screen><userinput>export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp;
 
-SAVE_LC_ALL=$LC_ALL &amp;&amp;
-LC_ALL=POSIX &amp;&amp;
-
 ./configure --prefix=/opt/texlive/&texlive-year;              \
             --bindir=/opt/texlive/&texlive-year;/bin/$TEXARCH \
             --datarootdir=/opt/texlive/&texlive-year;         \
-            --includedir=/usr/include                         \
+            --includedir=/usr/include               \
             --libdir=/opt/texlive/&texlive-year;/texmf-dist   \
             --mandir=/opt/texlive/&texlive-year;/texmf-dist/doc/man &amp;&amp;
-make &amp;&amp;
-LC_ALL=$SAVE_LC_ALL &amp;&amp; unset SAVE_LC_ALL
-</userinput></screen>
+make LC_ALL=POSIX</userinput></screen>
 
     <para>
       This package does not have a testsuite.
@@ -125,8 +120,15 @@ LC_ALL=$SAVE_LC_ALL &amp;&amp; unset SAVE_LC_ALL
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+     href="../../xincludes/tex-prefix.xml"/>
+
+    <para><parameter>--includedir=/usr/include</parameter>:
+    This parameter ensures that the <filename>kpathsea</filename>
+    headers from <xref linkend="texlive"/> will be found.</para>
+
     <para>
-      <parameter>SAVE_LC_ALL=...</parameter>: with the current version of
+      <parameter>make LC_ALL=POSIX</parameter>: with the current version of
       <application>coreutils</application> it is essential to build
       <application>xindy</application> in the POSIX (or C) locale because in a
       UTF-8 locale the file <filename>latin.xdy</filename> will contain only a
@@ -135,13 +137,6 @@ LC_ALL=$SAVE_LC_ALL &amp;&amp; unset SAVE_LC_ALL
       <application>lisp</application> merge-rule commands it ought to contain.
     </para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/tex-prefix.xml"/>
-
-    <para><parameter>--includedir=/usr/include</parameter>:
-    This parameter ensures that the <filename>kpathsea</filename>
-    headers from <xref linkend="texlive"/> will be found.</para>
-
   </sect2>
 
   <sect2 role="content">