Merged r2952,2953,2957 from trunk.
This commit is contained in:
parent
c361b247e7
commit
9d158f9c86
2 changed files with 41 additions and 1 deletions
|
@ -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
|
||||
|
||||
|
||||
|
|
|
@ -144,7 +144,10 @@ UNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'`
|
|||
cd $UNPACKDIR
|
||||
</xsl:text>
|
||||
<xsl:apply-templates select=".//screen | .//para/command"/>
|
||||
<xsl:text>
</xsl:text>
|
||||
<xsl:if test="$sudo = 'y'">
|
||||
<xsl:text>sudo </xsl:text>
|
||||
</xsl:if>
|
||||
<xsl:text>ldconfig

</xsl:text>
|
||||
</xsl:when>
|
||||
<xsl:when test="@role = 'configuration'">
|
||||
<xsl:apply-templates select=".//screen"/>
|
||||
|
|
Reference in a new issue