From 5652a81e2194c606f76848f7c216f4a79f4392ae Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Wed, 30 Sep 2015 21:48:57 +0000
Subject: [PATCH] Clarify qt5 setup when installing in /usr

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@16493 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 kde/kf5/kf5-intro.xml | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/kde/kf5/kf5-intro.xml b/kde/kf5/kf5-intro.xml
index 4998efbb6b..297bb549b6 100644
--- a/kde/kf5/kf5-intro.xml
+++ b/kde/kf5/kf5-intro.xml
@@ -44,27 +44,36 @@
 
     <para>
       It is a good idea to add the following variables to your
-      system or personal profile:
+      system or personal profiles:
     </para>
 
-<screen role="root"><userinput>cat &gt; /etc/profile.d/kf5.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/kf5.sh
+<screen role="root"><userinput>cat &gt;&gt; /etc/profile.d/qt5.sh &lt;&lt; "EOF"
+<literal># Begin kf5 extention for /etc/profile.d/qt5.sh
 
-. /etc/profile.d/qt5.sh
+pathappend /usr/lib/qt5/plugins    QT_PLUGIN_PATH
+pathappend $QT5DIR/lib/plugins     QT_PLUGIN_PATH
+
+pathappend /usr/lib/qt5/qml        QML_IMPORT_PATH
+pathappend $QT5DIR/lib/qml         QML_IMPORT_PATH
+
+pathappend /usr/lib/qt5/qml        QML2_IMPORT_PATH
+pathappend $QT5DIR/lib/qml         QML2_IMPORT_PATH
+
+# End extention for /etc/profile.d/qt5.sh</literal>
+EOF
+
+cat &gt; /etc/profile.d/kf5.sh &lt;&lt; "EOF"
+<literal># Begin /etc/profile.d/kf5.sh
 
 export KF5_PREFIX=/usr
 
-pathappend /usr/lib/qt5/plugins    QT_PLUGIN_PATH
-pathappend $QT5DIR/lib/qt5/plugins QT_PLUGIN_PATH
-
-pathappend /usr/lib/qt5/qml        QML_IMPORT_PATH
-pathappend $QT5DIR/lib/qt5/qml     QML_IMPORT_PATH
-
-pathappend /usr/lib/qt5/qml        QML2_IMPORT_PATH
-pathappend $QT5DIR/lib/qt5/qml     QML2_IMPORT_PATH
-
 # End /etc/profile.d/kf5.sh</literal>
 EOF</userinput></screen>
+
+    <note><para>If <application>qt5</application> was installed in /usr, the
+    $QT5DIR/lib/ portions of the above paths may need to be changed to
+    $QT5DIR/lib/qt5/.</para></note>
+
     <warning>
       <para>
         If <application>KDE4</application> is installed in