From 89cb93bd91b471b2dea5b6ad2791e2e7d24cc37b Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Mon, 7 Jan 2013 10:52:43 +0000
Subject: [PATCH] Update of BLFS/envars.conf file: - new KDE envars and
 instructions - obsoleting GNOME envars as they are not needed in the present
 version of the book

---
 BLFS/envars.conf | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/BLFS/envars.conf b/BLFS/envars.conf
index b8c80cd..2e1404b 100644
--- a/BLFS/envars.conf
+++ b/BLFS/envars.conf
@@ -44,8 +44,12 @@ export XORG_CONFIG="--prefix=$XORG_PREFIX --sysconfdir=/etc --mandir=$XORG_PREFI
 
 #======== GNOME envars ===========
 
-# Refer to `Chapter 33. GNOME Core Packages->Pre-installation Configuration'
-# for rationale. We use envars.conf instead of /etc/profile.d. But if you
+# Refer to `Chapter 30. Right now, the book hard codes --prefix=/usr
+# and does not make use of the variables below. If you need another prefix,
+# You'll have to modifiy the prefix in the book source and use the variables
+# below. But this is not supported in this tool.
+#======== LEGACY GNOME envars ====
+# We use envars.conf instead of /etc/profile.d. But if you
 # install into a different prefix, you'll need to update ld.so.conf and
 # man-db.conf, too.
 
@@ -68,35 +72,34 @@ export XDG_DATA_DIRS=/usr/share:/usr/local/share
 # Refer to `Chapter 27. Introduction->KDE Pre-installation Configuration'
 # for rationale. We use envars.conf instead of /etc/profile.d. But if you
 # install into a different prefix, you'll need to update ld.so.conf and
-# man-db.conf, too.
+# man-db.conf, and to create and populate the directories $KDE_PREFIX/share
+# and /etc/dbus-1, as instructed.
 
 #--- Installation prefix
 export KDE_PREFIX=/usr
 
 #--- If you want to install KDE on a non standard prefix, uncomment
 #    the next lines and edit them it as needed.
-#KDE_PREFIX=/opt/kde
-#KDEDIR=$KDE_PREFIX
+#export KDE_PREFIX=/opt/kde
+#export KDEDIR=$KDE_PREFIX
 
 #PATH=$PATH:$KDE_PREFIX/bin
 #if [ -z PKG_CONFIG_PATH ]; then
-#  PKG_CONFIG_PATH=$KDE_PREFIX/lib/pkgconfig:$KDE_PREFIX/share/pkgconfig
+#export   PKG_CONFIG_PATH=$KDE_PREFIX/lib/pkgconfig:$KDE_PREFIX/share/pkgconfig
 #else
 #  PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$KDE_PREFIX/lib/pkgconfig:$KDE_PREFIX/share/pkgconfig
 #fi
 #if [ -z XDG_DATA_DIRS ]; then
-#  XDG_DATA_DIRS=$KDE_PREFIX/share
+#export   XDG_DATA_DIRS=$KDE_PREFIX/share
 #else
 #  XDG_DATA_DIRS=$XDG_DATA_DIRS:$KDE_PREFIX/share
 #fi
 #if [ -z XDG_CONFIG_DIRS ]; then
-#  XDG_CONFIG_DIRS=/etc/kde/xdg
+#export   XDG_CONFIG_DIRS=/etc/kde/xdg
 #else
 #  XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/etc/kde/xdg
 #fi
 
-#export KDE_PREFIX KDEDIR KDEDIR
-
 #======== Optimizations =============
 
 # Global optimization settings can be placed here. This settings can be