Changeset c099902d for x/lib

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

File:

• x/lib/xulrunner.xml (modified) (3 diffs)

x/lib/xulrunner.xml

@@ -186 +186 @@
 make -f client.mk</userinput></screen>
 
-<!--
-if pkg-config -&#45;atleast-version &nspr-version; nspr
-then sed -i '/Version/aRequires: nspr &gt;= &nspr-version;' xulrunner/installer/libxul-embedding.pc.in
-else sed -i '/Version/aRequires: mozilla-nspr &gt;= &nspr-version;' xulrunner/installer/libxul-embedding.pc.in
-fi &amp;&amp;
--->
-
     <para>
       This package does not come with a test suite.
@@ -201 +194 @@
     </para>
 
-<screen role="root"><userinput>make -C xulrunner-build-dir install                       &amp;&amp;
-mkdir -p                  /usr/lib/mozilla/plugins        &amp;&amp;
-rm -rf                    /usr/lib/xulrunner-&xulrunner-version;/plugins &amp;&amp;
-ln -sv ../mozilla/plugins /usr/lib/xulrunner-&xulrunner-version;         &amp;&amp;
+<screen role="root"><userinput>make -C xulrunner-build-dir install               &amp;&amp;
+mkdir -p                 /usr/lib/mozilla/plugins &amp;&amp;
+rm -rf            /usr/lib/xulrunner-&xulrunner-version;/plugins &amp;&amp;
+ln -sv ../mozilla/plugins /usr/lib/xulrunner-&xulrunner-version; &amp;&amp;
 
 for library in /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/lib/*.so; do 
@@ -222 +215 @@
       <application>GCC 4.7</application>.
     </para>
-
-    <!-- is this sed nstill needed?
-    <para>
-      <command>if pkg-config -&#45;atleast-version &nspr-version; nspr;
-      then sed -i '/Version/aRequires: nspr &gt;= &nspr-version;'
-      xulrunner/installer/libxul-embedding.pc.in;
-      else sed -i '/Version/aRequires: mozilla-nspr &gt;= &nspr-version;'
-      xulrunner/installer/libxul-embedding.pc.in;
-      fi</command>: This uses <command>pkg-config</command> to see if
-      <xref linkend="nspr"/> is installed and then adds a line to require
-      <application>nspr</application> or <application>mozilla-nspr</application>
-      to <filename>libxul-embedding.pc</filename>. If you try to build some
-      other applications without this, the prtypes header from NSPR will not be
-      found.
-    </para> -->
 
     <para>