Author: pierre
Date: Tue Sep 22 08:00:47 2015
New Revision: 16442
Log:
Fix qt4-5 instructions:
- add environment variables for qtwebkit build
- enclose qtwebkit instrucitons between pushd-popd
- add quotes to some here documents
- typo in phonon
Modified:
trunk/BOOK/kde/phonon.xml
trunk/BOOK/x/lib/qt4.xml
trunk/BOOK/x/lib/qt5.xml
Modified: trunk/BOOK/kde/phonon.xml
==============================================================================
--- trunk/BOOK/kde/phonon.xml Mon Sep 21 18:11:20 2015 (r16441)
+++ trunk/BOOK/kde/phonon.xml Tue Sep 22 08:00:47 2015 (r16442)
@@ -82,7 +82,7 @@
<para>The <application>Phonon</application> libraries are used by both KDE4
and KF5, but they must be linked to <xref linkend="qt4"/> and <xref
- linkend="qt5"/> respectively. The two versions to not conflict with each
+ linkend="qt5"/> respectively. The two versions do not conflict with each
other.</para>
<para>If building for KDE4, make sure <xref linkend="qt4"/> has been built
Modified: trunk/BOOK/x/lib/qt4.xml
==============================================================================
--- trunk/BOOK/x/lib/qt4.xml Mon Sep 21 18:11:20 2015 (r16441)
+++ trunk/BOOK/x/lib/qt4.xml Tue Sep 22 08:00:47 2015 (r16442)
@@ -176,7 +176,7 @@
the directory and create a symlink:
</para>
-<screen role="root"><userinput>mkdir /opt/qt-&qt4-version;
+<screen role="root"><userinput>mkdir -pv /opt/qt-&qt4-version;
ln -sfnv qt-&qt4-version; /opt/qt4</userinput></screen>
<para>
@@ -310,12 +310,15 @@
this, run the following instructions:</para>
<screen><userinput>mkdir qtwebkit-&wk-version; &&
-cd qtwebkit-&wk-version; &&
+pushd qtwebkit-&wk-version; &&
tar -xf ../../qtwebkit-&wk-version;.tar.gz &&
patch -Np1 -i ../../qtwebkit-&wk-version;-gcc5-1.patch &&
-Tools/Scripts/build-webkit --qt --no-webkit2
--prefix=$QT4PREFIX</userinput></screen>
+QTDIR=$QT4PREFIX PATH=$PATH:$QT4PREFIX/bin \
+Tools/Scripts/build-webkit --qt \
+ --no-webkit2 \
+ --prefix=$QT4PREFIX</userinput></screen>
<para>If desired, the build process can use parallel processors by
adding the option <option>--makeargs=-j<number></option> to
@@ -330,6 +333,13 @@
<bridgehead renderas="sect3">Installing Auxillary Files</bridgehead>
<para>
+ The following instructions assume that your working directory is the top
+ of the <application>Qt4</application> source tree:
+ </para>
+
+<screen><userinput>popd</userinput></screen>
+
+ <para>
Install images and create the menu entries for installed applications.
The <envar>QT4BINDIR</envar> variable is used here to point to the
directory for the executable programs. If you have changed the bindir
@@ -515,7 +525,7 @@
As the <systemitem class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>cat > /etc/profile.d/qt4.sh << EOF
+<screen role="root"><userinput>cat > /etc/profile.d/qt4.sh << "EOF"
<literal># Begin /etc/profile.d/qt4.sh
QT4DIR=/usr
@@ -555,7 +565,7 @@
the <filename>/etc/profile.d/qt4.sh</filename> file:
</para>
-<screen role="root"><userinput>cat > /etc/profile.d/qt4.sh << EOF
+<screen role="root"><userinput>cat > /etc/profile.d/qt4.sh << "EOF"
<literal># Begin /etc/profile.d/qt4.sh
QT4DIR=/opt/qt4
Modified: trunk/BOOK/x/lib/qt5.xml
==============================================================================
--- trunk/BOOK/x/lib/qt5.xml Mon Sep 21 18:11:20 2015 (r16441)
+++ trunk/BOOK/x/lib/qt5.xml Tue Sep 22 08:00:47 2015 (r16442)
@@ -486,7 +486,7 @@
the <filename>/etc/profile.d/qt5.sh</filename> file:
</para>
-<screen role="root"><userinput>cat > /etc/profile.d/qt5.sh << EOF
+<screen role="root"><userinput>cat > /etc/profile.d/qt5.sh << "EOF"
<literal># Begin /etc/profile.d/qt5.sh
QT5DIR=/opt/qt5
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
