Changeset 9d158f9

Timestamp:

08/15/2006 11:58:08 AM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

59f096b

Parents:

c361b24

Message:

Merged r2952,2953,2957 from trunk.

Location:

BLFS

Files:

• envars.conf (modified) (2 diffs)
• libs/scripts.xsl (modified) (1 diff)

BLFS/envars.conf

@@ -9 +9 @@
 #####
 
+#======== Common envars ==========
 
 #--- The local repository for packages/file
@@ -27 +28 @@
 #    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
+
+

BLFS/libs/scripts.xsl

@@ -145 +145 @@
           </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'">