From 9d158f9c86c842ea33ff1772199f48d6d0bf1a74 Mon Sep 17 00:00:00 2001
From: Manuel Canales Esparcia <manuel@linuxfromscratch.org>
Date: Tue, 15 Aug 2006 11:58:08 +0000
Subject: [PATCH] Merged r2952,2953,2957 from trunk.

---
 BLFS/envars.conf      | 37 +++++++++++++++++++++++++++++++++++++
 BLFS/libs/scripts.xsl |  5 ++++-
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/BLFS/envars.conf b/BLFS/envars.conf
index e4b5a48..99f7de9 100644
--- a/BLFS/envars.conf
+++ b/BLFS/envars.conf
@@ -8,6 +8,7 @@
 #
 #####
 
+#======== Common envars ==========
 
 #--- The local repository for packages/file
 #    Any missing file will be downloaded and archived here,
@@ -26,3 +27,39 @@ export FTP_SERVER=ftp://anduin.linuxfromscratch.org/BLFS/
 #    Full path to the top level directory where packages will be stored,
 #    unpacked, and compiled.
 export SRC_DIR=$HOME/sources
+
+
+#======== Xorg7 envars ===========
+
+#--- Installation prefix
+export XORG_PREFIX=/usr
+
+#--- Configure switches
+export XORG_CONFIG="--prefix=$XORG_PREFIX --sysconfdir=/etc --localstatedir=/var --datadir=$XORG_PREFIX/lib"
+
+#======== GNOME envars ===========
+
+#--- Installation prefix
+export GNOME_PREFIX=/usr
+
+#--- If you want to install GNOME on a non standart prefix, uncomment
+#    the next export lines and edit it if needed.
+#    See also the GNOME Pre-installation Configuration HTML page for
+#    aditional required commands.
+#export PATH=$PATH:$GNOME_PREFIX/bin
+#export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$GNOME_PREFIX/lib/pkgconfig
+#export GNOME_LIBCONFIG_PATH=/usr/lib:$GNOME_PREFIX/lib
+
+#======== KDE envars =============
+
+#--- Installation prefix
+export KDE_PREFIX=/usr
+
+#--- If you want to install KDE on a non standart prefix, uncomment
+#    the next export lines and edit it if needed.
+#    See also the KDE Pre-installation Configuration HTML page for
+#    aditional required commands.
+#export PATH=$PATH:$KDE_PREFIX/bin
+#export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$KDE_PREFIX/lib/pkgconfig
+
+
diff --git a/BLFS/libs/scripts.xsl b/BLFS/libs/scripts.xsl
index 086e054..395253d 100644
--- a/BLFS/libs/scripts.xsl
+++ b/BLFS/libs/scripts.xsl
@@ -144,7 +144,10 @@ UNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'`
 cd $UNPACKDIR
           </xsl:text>
         <xsl:apply-templates select=".//screen | .//para/command"/>
-        <xsl:text>&#xA;</xsl:text>
+        <xsl:if test="$sudo = 'y'">
+          <xsl:text>sudo </xsl:text>
+        </xsl:if>
+        <xsl:text>ldconfig&#xA;&#xA;</xsl:text>
       </xsl:when>
       <xsl:when test="@role = 'configuration'">
         <xsl:apply-templates select=".//screen"/>