Ignore:
Timestamp:
06/05/2013 09:28:44 AM (11 years ago)
Author:
Krejzi <krejzi@…>
Branches:
systemd-11177
Children:
5b00a2a
Parents:
13e0a61
Message:

Merge trunk and systemd branch.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@11264 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:
1 edited

Legend:

Unmodified
Added
Removed
  • general/genlib/qjson.xml

    r13e0a61 raf73a280  
    7575    <bridgehead renderas="sect4">Required</bridgehead>
    7676    <para role="required">
    77       <xref linkend="qt"/> and
     77      <xref linkend="qt4"/> and
    7878      <xref linkend="cmake"/>
    7979    </para>   
     
    9494<screen><userinput>mkdir build &amp;&amp;
    9595cd build &amp;&amp;
    96 cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
     96cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
    9797      -DCMAKE_BUILD_TYPE=Release \
    9898      .. &amp;&amp;
     
    126126        </seg>
    127127        <seg>
    128           &qt-dir;/include/json and &qt-dir;/lib/cmake/qjson
     128          &qt4-dir;/include/json and &qt4-dir;/lib/cmake/qjson
    129129        </seg>
    130130      </seglistitem>
Note: See TracChangeset for help on using the changeset viewer.