r4740 - in trunk/BOOK: . introduction/welcome x/lib

tushar at linuxfromscratch.org tushar at linuxfromscratch.org
Tue Jul 19 23:01:22 PDT 2005


Author: tushar
Date: 2005-07-20 00:01:17 -0600 (Wed, 20 Jul 2005)
New Revision: 4740

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/lib/qt.xml
Log:
Avoid qt reinstallation problems

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2005-07-19 20:48:40 UTC (rev 4739)
+++ trunk/BOOK/general.ent	2005-07-20 06:01:17 UTC (rev 4740)
@@ -1,4 +1,4 @@
-<!ENTITY day          "19">
+<!ENTITY day          "20">
 <!ENTITY month        "07">
 <!ENTITY year         "2005">
 <!ENTITY version      "svn-&year;&month;&day;">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-07-19 20:48:40 UTC (rev 4739)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-07-20 06:01:17 UTC (rev 4740)
@@ -24,6 +24,11 @@
 
   <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-19 20:48:40 UTC (rev 4739)
+++ trunk/BOOK/x/lib/qt.xml	2005-07-20 06:01:17 UTC (rev 4740)
@@ -116,14 +116,16 @@
       This is the method that most commercial distributions use.</para>
 
       <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>
+		<para>The installation incorrectly uses cp to install the files.
+		This causes problems if the <application>Qt</application> libraries
+		are already in use (e.g. you are logged in into your
+		<application>KDE</application> desktop environment). To avoid problems,
+		"cp -f" is replaced by "install" in <filename>qmake.conf</filename>.</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 &&
@@ -135,7 +137,8 @@
     -no-exceptions -thread -plugin-imgfmt-png \
     -system-libjpeg -system-libpng &&
 find -type f -name Makefile | xargs sed -i "s at -Wl,-rpath,/usr/lib@@g" &&
-make</userinput></screen>
+make &&
+exit</userinput></screen>
 
       <para>Now, as the <systemitem class="username">root</systemitem>
       user:</para>
@@ -145,10 +148,6 @@
 cp -v -r doc/man /usr/share &&
 cp -v -r examples /usr/share/doc/qt</userinput></screen>
 
-      <para>And finally back as the regular user:</para>
-
-<screen><userinput>exit</userinput></screen>
-
     </sect3>
 
     <sect3>
@@ -158,8 +157,7 @@
       developers. It has the advantage of keeping all the package files
       consolidated in a dedicated directory hierarchy. By using this method,
       an update can be made without overwriting a previous installation and
-      users can easily revert to a previous version by changing one symbolic l
-      ink.</para>
+      users can easily revert to a previous version by changing one symbolic link.</para>
 
       <para>The <application>Qt</application> developers use a default location
       of <filename class='directory'>/usr/local/qt/</filename>, however this
@@ -185,10 +183,6 @@
 cp -v -r doc/man /opt/qt/doc &&
 cp -v -r examples /opt/qt/doc</userinput></screen>
 
-      <para>And finally back as the regular user:</para>
-
-<screen><userinput>exit</userinput></screen>
-
       <note>
         <para>If you pass the
         <option>-plugin-sql-<replaceable>[driver]</replaceable></option>
@@ -276,7 +270,8 @@
       libraries. Alternatively, the variable can be set in the system wide
       <filename>/etc/profile</filename> file.</para>
 
-      <para>For Method 1:</para>
+      <para>For Method 1 (This is optional, only set this if an application is
+		unable to find the installed libraries):</para>
 
 <screen><literal>export QTDIR=/usr</literal></screen>
 




More information about the blfs-book mailing list