[blfs-book] r12158 - trunk/BOOK/x/lib

igor at higgs.linuxfromscratch.org igor at higgs.linuxfromscratch.org
Thu Nov 7 12:12:06 PST 2013


Author: igor
Date: Thu Nov  7 12:12:05 2013
New Revision: 12158

Log:
keep previous fix for the /opt method

Modified:
   trunk/BOOK/x/lib/qt4.xml

Modified: trunk/BOOK/x/lib/qt4.xml
==============================================================================
--- trunk/BOOK/x/lib/qt4.xml	Thu Nov  7 11:25:16 2013	(r12157)
+++ trunk/BOOK/x/lib/qt4.xml	Thu Nov  7 12:12:05 2013	(r12158)
@@ -345,14 +345,6 @@
 make</userinput></screen>
 
     <para>
-      Remove references to the build directory from the
-      <filename class="extension">.pc</filename> files by running
-      the following command:
-    </para>
-
-<screen><userinput>find . -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
-
-    <para>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
@@ -376,12 +368,10 @@
       <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>for file in 3Support CLucene Core DBus Declarative DesignerComponents \
-            Designer Gui Help Multimedia Network OpenGL Script \
-            ScriptTools Sql Svg Test UiTools WebKit XmlPatterns Xml phonon;
-do
-  [ -e $QTDIR/lib/libQt${file}.prl ] && sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' \
-                                                $QTDIR/lib/libQt${file}.prl
+<screen role="root"><userinput>for file in `basename -a -s .prl $QTDIR/lib/lib*.prl`; do
+  sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' \
+       $QTDIR/lib/${file}.prl
+  perl -pi -e "s, -L$PWD/?\S+,,g" $QTDIR/lib/pkgconfig/${file##lib}.pc
 done
 
 unset file</userinput></screen>



More information about the blfs-book mailing list