Changeset 4ef0f11

Timestamp:

11/07/2013 08:12:05 PM (10 years ago)

Author:

Igor Živković <igor@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 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:

cfa438a

Parents:

acacfb64

Message:

keep previous fix for the /opt method

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

File:

• x/lib/qt4.xml (modified) (2 diffs)

x/lib/qt4.xml

@@ -346 +346 @@
 
     <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>
@@ -377 +369 @@
     </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 ] &amp;&amp; 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