r4742 - in trunk/BOOK: introduction/welcome x/lib

tushar at linuxfromscratch.org tushar at linuxfromscratch.org
Wed Jul 20 08:56:12 PDT 2005


Author: tushar
Date: 2005-07-20 09:56:10 -0600 (Wed, 20 Jul 2005)
New Revision: 4742

Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/lib/qt.xml
Log:
Revert qt change

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-07-20 14:40:00 UTC (rev 4741)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-07-20 15:56:10 UTC (rev 4742)
@@ -25,11 +25,6 @@
   <itemizedlist>
     
     <listitem>
-      <para>July 20th 2005 [tushar]: For qt, replace cp by install
-      to allow installation even if the libraries are in use.</para>
-    </listitem>
-
-    <listitem>
       <para>July 19th 2005 [randy]: Updated to Doxygen-1.4.3.</para>
     </listitem>
 

Modified: trunk/BOOK/x/lib/qt.xml
===================================================================
--- trunk/BOOK/x/lib/qt.xml	2005-07-20 14:40:00 UTC (rev 4741)
+++ trunk/BOOK/x/lib/qt.xml	2005-07-20 15:56:10 UTC (rev 4742)
@@ -115,6 +115,7 @@
       <filename class='directory'>/usr</filename> hierarchy.
       This is the method that most commercial distributions use.</para>
 
+<!--
       <note>
         <para>The installation incorrectly uses <command>cp</command> to
         install the files. This causes problems if the
@@ -124,10 +125,16 @@
         replaced by <command>install</command> in
         <filename>qmake.conf</filename>.</para>
       </note>
+-->
+      <note>
+        <para>If <application>Qt</application> is being reinstalled, run the
+        following commands from a console or non-Qt based window manager.
+        It overwrites <application>Qt</application> libraries that should not
+        be in use during the install process.</para>
+      </note>
 
 <screen><userinput>sed -i -e 's:$(QTDIR)/include:&/qt:' \
        -e 's:$(QTDIR)/lib:&/qt:' \
-       -e "s:cp -f:install:" \
     mkspecs/linux*/qmake.conf &&
 bash
 export PATH=$PWD/bin:$PATH &&
@@ -175,7 +182,8 @@
 ./configure -prefix /opt/qt-&qt-version; -qt-gif -system-libpng \
     -system-libmng -system-zlib -system-libjpeg -no-exceptions \
     -thread -plugin-imgfmt-png &&
-make</userinput></screen>
+make &&
+exit</userinput></screen>
 
       <para>Now, as the <systemitem class="username">root</systemitem>
       user:</para>




More information about the blfs-book mailing list