Changeset ad41452 for kde4/core/phonon.xml

Timestamp:

04/15/2012 05:19:58 PM (12 years ago)

Author:

Ragnar Thomsen <rthomsen@…>

Branches:

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

1bc70b56

Parents:

86f9469

Message:

Fix Qca compile with GCC4.7. QTDIR variable.

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

File:

• kde4/core/phonon.xml (modified) (4 diffs)

kde4/core/phonon.xml

@@ -99 +99 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$QT4DIR \
+cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
       -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE \
       .. &amp;&amp;
@@ -113 +113 @@
     <title>Command Explanations</title>
 
-    <para><option>-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE</option>: This option ensures that the plugins and mkspecs files get installed in the correct location.</para>
+    <para><option>-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE</option>: 
+    This option ensures that the plugins and mkspecs files get installed in 
+    the correct location.</para>
 
   </sect2>
@@ -122 +124 @@
        
 <screen><userinput>sed -i -e 's#{includedir}$#&amp; -I\${includedir}/phonon#' \
-          $QT4DIR/lib/pkgconfig/phonon.pc</userinput></screen>
+          &qt-dir;/lib/pkgconfig/phonon.pc</userinput></screen>
 -->
 
@@ -137 +139 @@
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>none</seg>
-        <seg>libphonon.so, libphononexperimental.so</seg>
+        <seg>libphonon.so and libphononexperimental.so</seg>
         <seg>none</seg>
       </seglistitem>