Changeset c099902d


Ignore:
Timestamp:
05/16/2012 10:43:09 AM (12 years ago)
Author:
Andrew Benton <andy@…>
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:
7ded7e3
Parents:
9f28e60a
Message:

Added some mkdirs to check /usr/share/applications exists before we try to
put a file there.
Removed an unneeded sentence from the nss page and a comment from the
xulrunner page.

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

Files:
7 edited

Legend:

Unmodified
Added
Removed

  • postlfs/security/nss.xml

    r9f28e60a rc099902d  
    9797    <bridgehead renderas="sect4">Recommended</bridgehead>
    9898    <para role="recommended">
    99       <xref linkend="sqlite"/> (internal <application>sqlite</application> is
    100       incompatable with existing or future installations)
     99      <xref linkend="sqlite"/>
    101100    </para>
    102101

  • x/lib/xulrunner.xml

    r9f28e60a rc099902d  
    186186make -f client.mk</userinput></screen>
    187187
    188 <!--
    189 if pkg-config -&#45;atleast-version &nspr-version; nspr
    190 then sed -i '/Version/aRequires: nspr &gt;= &nspr-version;' xulrunner/installer/libxul-embedding.pc.in
    191 else sed -i '/Version/aRequires: mozilla-nspr &gt;= &nspr-version;' xulrunner/installer/libxul-embedding.pc.in
    192 fi &amp;&amp;
    193 -->
    194 
    195188    <para>
    196189      This package does not come with a test suite.
    … …  
    201194    </para>
    202195
    203 <screen role="root"><userinput>make -C xulrunner-build-dir install                       &amp;&amp;
    204 mkdir -p                  /usr/lib/mozilla/plugins        &amp;&amp;
    205 rm -rf                    /usr/lib/xulrunner-&xulrunner-version;/plugins &amp;&amp;
    206 ln -sv ../mozilla/plugins /usr/lib/xulrunner-&xulrunner-version;         &amp;&amp;
     196<screen role="root"><userinput>make -C xulrunner-build-dir install               &amp;&amp;
     197mkdir -p                 /usr/lib/mozilla/plugins &amp;&amp;
     198rm -rf            /usr/lib/xulrunner-&xulrunner-version;/plugins &amp;&amp;
     199ln -sv ../mozilla/plugins /usr/lib/xulrunner-&xulrunner-version; &amp;&amp;
    207200
    208201for library in /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/lib/*.so; do
    … …  
    222215      <application>GCC 4.7</application>.
    223216    </para>
    224 
    225     <!-- is this sed nstill needed?
    226     <para>
    227       <command>if pkg-config -&#45;atleast-version &nspr-version; nspr;
    228       then sed -i '/Version/aRequires: nspr &gt;= &nspr-version;'
    229       xulrunner/installer/libxul-embedding.pc.in;
    230       else sed -i '/Version/aRequires: mozilla-nspr &gt;= &nspr-version;'
    231       xulrunner/installer/libxul-embedding.pc.in;
    232       fi</command>: This uses <command>pkg-config</command> to see if
    233       <xref linkend="nspr"/> is installed and then adds a line to require
    234       <application>nspr</application> or <application>mozilla-nspr</application>
    235       to <filename>libxul-embedding.pc</filename>. If you try to build some
    236       other applications without this, the prtypes header from NSPR will not be
    237       found.
    238     </para> -->
    239217
    240218    <para>

  • xsoft/graphweb/firefox.xml

    r9f28e60a rc099902d  
    335335    </para>
    336336
    337 <screen role="root"><userinput>cat &gt; /usr/share/applications/firefox.desktop &lt;&lt; "EOF"
     337<screen role="root"><userinput>mkdir -p /usr/share/applications &amp;&amp;
     338cat &gt; /usr/share/applications/firefox.desktop &lt;&lt; "EOF" &amp;&amp;
    338339[Desktop Entry]
    339340Encoding=UTF-8

  • xsoft/graphweb/seamonkey.xml

    r9f28e60a rc099902d  
    342342    </para>
    343343
    344 <screen role="root"><userinput>cat &gt; /usr/share/applications/seamonkey.desktop &lt;&lt; "EOF"
     344<screen role="root"><userinput>mkdir -p /usr/share/applications &amp;&amp;
     345cat &gt; /usr/share/applications/seamonkey.desktop &lt;&lt; "EOF" &amp;&amp;
    345346[Desktop Entry]
    346347Encoding=UTF-8

  • xsoft/office/libreoffice.xml

    r9f28e60a rc099902d  
    346346    </para>
    347347
    348 <screen role="root"><userinput>for program in base calc draw impress math writer
     348<screen role="root"><userinput>mkdir -p /usr/share/applications &amp;&amp;
     349for program in base calc draw impress math writer
    349350do echo "[Desktop Entry]
    350351Encoding=UTF-8

  • xsoft/other/rox-filer.xml

    r9f28e60a rc099902d  
    242242
    243243<screen role="root"><userinput>ln -s ../rox/.DirIcon /usr/share/pixmaps/rox.png &amp;&amp;
     244mkdir -p /usr/share/applications &amp;&amp;
    244245cat &gt; /usr/share/applications/rox.desktop &lt;&lt; "HERE_DOC"
    245246[Desktop Entry]

  • xsoft/other/thunderbird.xml

    r9f28e60a rc099902d  
    305305    </para>
    306306
    307 <screen role="root"><userinput>cat &gt; /usr/share/applications/thunderbird.desktop &lt;&lt; "EOF"
     307<screen role="root"><userinput>mkdir -p /usr/share/applications &amp;&amp;
     308cat &gt; /usr/share/applications/thunderbird.desktop &lt;&lt; "EOF" &amp;&amp;
    308309[Desktop Entry]
    309310Encoding=UTF-8
Note: See TracChangeset for help on using the changeset viewer.