Changeset 033c86d

Timestamp:

07/20/2005 03:56:10 PM (19 years ago)

Author:

Tushar Teredesai <tushar@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 6.1, 6.2, 6.2.0, 6.2.0-rc1, 6.2.0-rc2, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

50d61ed

Parents:

884db0e3

Message:

Revert qt change

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@4742 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• x/lib/qt.xml (modified) (3 diffs)

introduction/welcome/changelog.xml

@@ -25 +25 @@
   <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>

x/lib/qt.xml

@@ -116 +116 @@
       This is the method that most commercial distributions use.</para>
 
+<!--
       <note>
         <para>The installation incorrectly uses <command>cp</command> to
@@ -125 +126 @@
         <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:&amp;/qt:' \
        -e 's:$(QTDIR)/lib:&amp;/qt:' \
-       -e "s:cp -f:install:" \
     mkspecs/linux*/qmake.conf &amp;&amp;
 bash
@@ -176 +183 @@
     -system-libmng -system-zlib -system-libjpeg -no-exceptions \
     -thread -plugin-imgfmt-png &amp;&amp;
-make</userinput></screen>
+make &amp;&amp;
+exit</userinput></screen>
 
       <para>Now, as the <systemitem class="username">root</systemitem>