[blfs-book] r9033 - in trunk/BOOK: . introduction/welcome x/lib xsoft/graphweb

andy at linuxfromscratch.org andy at linuxfromscratch.org
Tue Nov 29 06:51:08 PST 2011


Author: andy
Date: 2011-11-29 07:51:04 -0700 (Tue, 29 Nov 2011)
New Revision: 9033

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/lib/xulrunner.xml
   trunk/BOOK/xsoft/graphweb/firefox.xml
Log:
Updated to xulrunner to 8.0.1
Changed the Firefox page to not do make install, it shrinks what
firefox installs in /usr/lib from about 450 MB to about 34MB

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2011-11-29 12:24:08 UTC (rev 9032)
+++ trunk/BOOK/general.ent	2011-11-29 14:51:04 UTC (rev 9033)
@@ -569,7 +569,7 @@
 <!ENTITY freeglut-version             "2.6.0">
 <!ENTITY goffice-version              "0.8.10">
 <!ENTITY mesalib-version              "7.9">
-<!ENTITY xulrunner-version            "1.9.2.13">
+<!ENTITY xulrunner-version            "8.0.1">
 <!ENTITY webkitgtk-version            "1.2.5">
 <!ENTITY libsexy-version              "0.1.11">
 <!ENTITY libnotify-version            "0.4.5">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2011-11-29 12:24:08 UTC (rev 9032)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2011-11-29 14:51:04 UTC (rev 9033)
@@ -50,6 +50,9 @@
         <listitem>
           <para>[wblaszcz] - Updated to polkit-0.102.</para>
         </listitem>
+        <listitem>
+          <para>[abenton] - Updated to xulrunner to 8.0.1.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

Modified: trunk/BOOK/x/lib/xulrunner.xml
===================================================================
--- trunk/BOOK/x/lib/xulrunner.xml	2011-11-29 12:24:08 UTC (rev 9032)
+++ trunk/BOOK/x/lib/xulrunner.xml	2011-11-29 14:51:04 UTC (rev 9033)
@@ -7,10 +7,10 @@
   <!ENTITY xulrunner-download-http "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
   <!ENTITY xulrunner-download-ftp  "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
   <!-- md5sum and size should match firefox, but the buildsize and time will differ -->
-  <!ENTITY xulrunner-md5sum        "d7c90aed8209beefa74badf02e8eeae1">
-  <!ENTITY xulrunner-size          "51 MB">
-  <!ENTITY xulrunner-buildsize     "820 MB">
-  <!ENTITY xulrunner-time          "20 SBU">
+  <!ENTITY xulrunner-md5sum        "b7d09b082e88a74860a51a8e04e29333">
+  <!ENTITY xulrunner-size          "67 MB">
+  <!ENTITY xulrunner-buildsize     "2.6 GB">
+  <!ENTITY xulrunner-time          "22 SBU">
 ]>
 
 <sect1 id="xulrunner" xreflabel="Xulrunner-&xulrunner-version;">
@@ -31,13 +31,14 @@
     <title>Introduction to Xulrunner</title>
 
     <para><application>Xulrunner</application> is a runtime environment for XUL
-    applications, and forms the major part of the <application>Mozilla</application>
-    codebase.  In particular, it provides the gecko engine together with pkgconfig
-    files so that applications such as <application>Yelp</application> can find
-    and use it.  However, be aware that Gnome applications are transitioning to
-    <application>Webkit</application> instead of gecko.</para>
+    applications, and forms the major part of the
+    <application>Mozilla</application> codebase. In particular, it provides the
+    gecko engine together with pkgconfig files so that applications such as
+    <application>Yelp</application> can find and use it.  However, be aware that
+    Gnome applications are transitioning to <application>Webkit</application>
+    instead of gecko.</para>
 
-    &lfs67_checked;
+    &lfs70_checked;
     <para>&lfssvn_checked;20101029&lfssvn_checked2;</para>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -47,16 +48,6 @@
       </listitem>
       <listitem>
         <para>Download (FTP): <ulink url="&xulrunner-download-ftp;"/></para>
-	<tip><para>When a new version of <application>Firefox</application> is
-	released, sometimes a corresponding new version of
-	<application>Xulrunner</application> appears at the same time. At other
-	times it appears several days later or not at all. So far in the
-	<application>Firefox-3.x</application> series, every new release has
-	created xulrunner libraries with a corresponding new version. Whenever
-	a separate Xulrunner tarball has been released, it has been bitwise
-	identical to the corresponding Firefox tarball. Use the
-	<application>Firefox</application> tarball to save downloading this
-	large package twice.</para></tip>
       </listitem>
       <listitem>
         <para>Download MD5 sum: &xulrunner-md5sum;</para>
@@ -65,58 +56,39 @@
         <para>Download size: &xulrunner-size;</para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &xulrunner-buildsize; (using
-        all dependencies)</para>
+        <para>Estimated disk space required: &xulrunner-buildsize;</para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &xulrunner-time; (using all
-        dependencies)</para>
+        <para>Estimated build time: &xulrunner-time;</para>
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Optional patch: <ulink
-        url="&patch-root;/firefox-&firefox-version;-provide_system_nspr_nss-1.patch"/>
-        (Required if using the included NSPR and NSS libraries as system versions for
-        other packages)</para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">Xulrunner Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="alsa-lib"/>,
-    <xref linkend="gtk2"/>,
-    <xref linkend="libidl"/>,
-    <xref linkend="pango"/>,
-    <xref linkend="python"/>, and
-    <xref linkend="zip"/></para>
+    <para role="required"><xref linkend="alsa-lib"/>, <xref linkend="gtk2"/>,
+    <xref linkend="libidl"/> and <xref linkend="zip"/></para>
 
-    <para>Note: <application>libjpeg</application> should have been installed
-    before <application>GTK+</application> and should exist on your system. If
-    for some reason you haven't installed <application>libjpeg</application>,
-    you should remove the <option>--with-system-jpeg</option> option from the
+    <para>Note: <application>libjpeg</application> and
+    <application>libpng</application> (patched for apng support) should have
+    been installed before <application>gdk-pixbuf</application> and should
+    exist on your system. If for some strange reason you haven't installed
+    them, you should remove the <option>--with-system-jpeg</option> and
+    <option>--with-system-png</option> options from the
     <filename>mozconfig</filename> file created below.</para>
 
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="sqlite"/> (internal sqlite is
-    incompatable with existing or future installations)</para>
-
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="dbus-glib"/>,
-    <xref linkend="doxygen"/>,
-    <xref linkend="curl"/> (only for crash-reporter),
-    <xref linkend="gnome-vfs"/> and <xref linkend="libgnomeui"/> (for gnome integration),
-    <xref linkend="libnotify"/>,
-    <xref linkend="libpng"/> (patched for apng support),
-    <xref linkend="nss"/> (recommended if you build any other Mozilla.org packages),
-    <xref linkend="startup-notification"/>,
-    <xref linkend="unzip"/>,
+    <xref linkend="startup-notification"/>, <xref linkend="sqlite"/>,
+    <ulink url="http://www.webmproject.org/code/">libvpx</ulink>,
     <ulink url="http://sourceforge.net/projects/hunspell/">Hunspell</ulink>,
-    <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing the jemalloc code), and
-    <xref linkend="wget"/></para>
+    <xref linkend="doxygen"/>,
+    <xref linkend="gnome-vfs"/> and <xref linkend="libgnomeui"/> (for gnome
+    integration), <xref linkend="libnotify"/>, <xref linkend="nspr"/>,
+    <xref linkend="nss"/>, <xref linkend="unzip"/>,
+    <xref linkend="wireless_tools"/>,
+    <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing
+    the jemalloc code) and <xref linkend="wget"/></para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/xulrunner"/></para>
@@ -132,197 +104,73 @@
     is created below. To see the entire list of available configuration options
     (and an abbreviated description of each one), issue
     <command>./configure --help</command>. You should review the entire file
-    and comment or uncomment options as necessary. If you would prefer to
-    download the file instead of creating it by typing or cut-and-pasting, you
-    can find it at
-    <ulink url="&files-anduin;/xulrunner-&xulrunner-version;-mozconfig"/>
-    (the file must be installed in the root of the source tree, and named
-    <filename>mozconfig</filename> or <filename>.mozconfig</filename>).</para>
+    and comment or uncomment options as necessary.</para>
 
 <screen><?dbfo keep-together="auto"?><userinput>cat > mozconfig << "EOF"
-<literal># This file contains the options used in the Xulrunner build. You may
-# need to specify additional options for your specific build needs.
-# Use the information provided by running './configure --help' to
-# help you determine if you need to add any additional options.
-# Some additional options can be added by uncommenting the examples
-# in this file or adding options by inserting a line containing
-# 'ac_add_options --some-option-you-need'.  Be aware that some accepted
-# options, such as '--with-system-bz2', do not affect the build.
+<literal># If you have a multicore machine you can speed up the build by running
+# several jobs at once, but if you have a single core, delete this line:
+mk_add_options MOZ_MAKE_FLAGS="-j4"
 
-# Specify that Xulrunner should be built. Note that this line is commented out
-# because it is redundant with the next setting.
-#ac_add_options --enable-application=xulrunner
+# If you have installed DBus-Glib you can delete this option:
+ac_add_options --disable-dbus
 
-# Use the default settings specified in the source tree. The
-# --enable-application=xulrunner is set in this file.
-. $topsrcdir/xulrunner/config/mozconfig
+# If you have installed wireless-tools you can delete this option:
+ac_add_options --disable-necko-wifi
 
-# Create an object directory and specify to build the package in that
-# directory. If desired, modify the location of the object directory
-# to a directory inside the source tree by removing '../' from the
-# line below.
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../xulrunner-build
-
-# Specify the installation prefix. If you would prefer Xulrunner installed in a
-# different prefix, modify the line below to fit your needs (the system.conf
-# configuration file will always be installed to /etc/gre.d).
-ac_add_options --prefix=/usr
-
-# Apply a minimal level of optimization (-O).
-ac_add_options --enable-optimize
-
-# These options are used so that the Xulrunner binaries are linked to
-# the system-installed copies of the specified libraries instead of
-# the source tree code which may not be the most recent versions.
-# With the exception of libsqlite3, the libraries are statically linked.
-
-# (Options to use system installed libraries)
-# Using the shipped version of libsqlite3 has been reported to cause
-# problems with other applications which were using sqlite3.
-# Only comment this line if you know exactly what you are doing!
-ac_add_options --enable-system-sqlite
-
-# Comment this only if you want to use whatever patched version of cairo
-# is in the shipped mozilla tree, together with the system headers.
-ac_add_options --enable-system-cairo
-
-# Comment this if you have not installed lcms.
-ac_add_options --enable-system-lcms
-
-# Uncomment this if you have installed Hunspell
-#ac_add_options --enable-system-hunspell
-
-# Uncomment this if you have installed startup-notification
-#ac_add_options --enable-startup-notification
-
-# Comment this if you did not build libjpeg before GTK+-2.
-ac_add_options --with-system-jpeg
-
-# These two options enable support for building Xulrunner with
-# system-installed versions of the Network Security Services (NSS)
-# and Netscape Portable Runtime (NSPR) libraries. Comment them if
-# you wish to use the included copies (not recommended).
+# If you have not installed nss delete these two lines:
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 
-# Comment this if you have not built png with the apng patch.
-ac_add_options --with-system-png
+# Uncomment these if you have installed them:
+# ac_add_options --enable-system-sqlite
+# ac_add_options --enable-system-lcms
+# ac_add_options --with-system-libvpx
+# ac_add_options --enable-startup-notification
 
-# The pthreads option is only used when building nspr
-# Uncomment this if you build the included nspr.
-#ac_add_options --with-pthreads
-
-# Zlib is included in LFS. Do not comment this line.
-ac_add_options --with-system-zlib
-
-# (Options to disable parts of the package)
-# This option is used to disable the a11y support in the Xulrunner
-# binaries. Comment out this option if you require a11y support.
-ac_add_options --disable-accessibility
-
-# Uncomment this if you did not build cURL.
-#ac_add_options --disable-crashreporter
-
-# Comment this if you have built DBus-Glib.
-ac_add_options --disable-dbus
-
-# Comment this if you have Gnome-VFS and libgnomeui, and wish to
-# integrate Xulrunner into your Gnome desktop.
-ac_add_options --disable-gnomevfs
-
-# Comment this if you have wireless-tools installed and wish to use the new
-# Necko WiFi scanning.
-ac_add_options --disable-necko-wifi
-
-# Comment this if you have installed libnotify.
-ac_add_options --disable-libnotify
-
-# This option is added so that the Mozilla Installer program is not
-# built or installed. The program is not required for a BLFS
-# installation of Xulrunner.
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build-dir
+ac_add_options --prefix=/usr
+ac_add_options --enable-application=xulrunner
+ac_add_options --enable-pthreads
+ac_add_options --enable-system-ffi
+ac_add_options --enable-system-jpeg
+ac_add_options --enable-system-png
+ac_add_options --enable-system-cairo
+ac_add_options --enable-system-zlib
+ac_add_options --enable-shared
+ac_add_options --disable-static
+ac_add_options --disable-debug
+ac_add_options --disable-crashreporter
 ac_add_options --disable-installer
-
-# If you enable javaxpcom, you must have a java compiler installed.
-ac_add_options --disable-javaxpcom
-
-# This option is added so that test libraries and programs are not
-# built. These would only be required for debugging purposes.
-ac_add_options --disable-tests
-
-# Disable the updater, which is not appropriate if you build from source.
 ac_add_options --disable-updater
-
-# (options to add extra parts of the package)
-# This option causes the installed Firefox binaries to have the official
-# Firefox name embedded in them. Due to license restrictions, you
-# may not distribute binaries created using this option.  It also
-# means you get a popup EULA when you first run a Xulrunner Gecko engined
-# application.
-ac_add_options --enable-official-branding
-
-# Use the anti-phishing measures (a blacklist of sites).
-ac_add_options --enable-safe-browsing
-
-# This option is used so that the debugging symbols are removed from
-# the installed binaries during the installation process. Comment out
-# this option if you may have a need to retain the debugging symbols
-# in the installed binaries (the resulting binaries will be about 7MB
-# bigger).
-ac_add_options --enable-strip
-
-# Uncomment this option if you desire support for dual-monitor
-# display using the X-Window Xinerama libraries.
-#ac_add_options --enable-xinerama
-
-# This option identifies the default binary directory of the Xulrunner
-# installation and is used to locate Xulrunner's installed files. This
-# option is is only used for development purposes.
-#ac_add_options --with-default-mozilla-five-home=/usr/lib/xulrunner-&xulrunner-version;</literal>
-
+ac_add_options --disable-tests</literal>
 EOF</userinput></screen>
 
-    <para>If you did not install <xref linkend="nspr"/> and
-    <xref linkend="nss"/>, then apply the patch with the following
-    command:</para>
-
-<screen><userinput>patch -Np1 -i ../firefox-&firefox-version;-provide_system_nss_nspr-1.patch</userinput></screen>
-
     <para>Install <application>Xulrunner</application> by issuing the
     following commands:</para>
 
-<screen><userinput>echo "Requires: nspr" >>xulrunner/installer/libxul-embedding.pc.in &&
-make -f client.mk build</userinput></screen>
+<screen><userinput>sed -i '/Version/aRequires: nspr >= 4.8.9' xulrunner/installer/libxul-embedding.pc.in &&
+make -f client.mk</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>Now, as the <systemitem class="username">root</systemitem>
+    user:</para>
 
-<!-- I really don't think we need the last command to installl symlinks to the
-     Xul libraries. Any package using Xul is going to use the pkgconfig file to
-     find the things it needs -->
-<screen role="root"><userinput>make -f client.mk install &&
+<screen role="root"><userinput>make -C xulrunner-build-dir install &&
+mkdir -p /usr/lib/mozilla &&
+rm -rf /usr/lib/xulrunner-&xulrunner-version;/plugins &&
+ln -sv ../mozilla/plugins /usr/lib/xulrunner-&xulrunner-version; &&
+chown -Rv root:root /usr/{include,lib,share/idl}/xulrunner-*</userinput></screen>
 
-install -v -m755 -d /usr/lib/mozilla &&
-ln -sv              /usr/lib/xulrunner-&xulrunner-version;/plugins \
-                    /usr/lib/mozilla &&
-
-chown -Rv root:root /usr/lib/xulrunner-* \
-                    /usr/share/idl/xulrunner-&xulrunner-version; \
-                    /usr/include/xulrunner-&xulrunner-version;</userinput></screen>
-                    
-<!-- commented out per discussion on BLFS-Dev
-ln -sfv             xulrunner-devel-&xulrunner-version;/lib/lib{xul,xpcom,mozjs}.so \
-                    /usr/lib</userinput></screen> -->
-
-    <para>If you elected to use the included NSPR and NSS, while still the
+    <para>If you elected to use the included NSPR and NSS (ie, if you have
+    <emphasis>not</emphasis> installed <xref linkend="nspr"/> and
+    <xref linkend="nss"/>), while still the
     <systemitem class="username">root</systemitem> user, complete the
     installation with the following commands:</para>
 
-<screen role="root"><userinput>for DL in \
-    libnss3.so libnssutil3.so libsmime3.so libssl3.so libsoftokn3.so \
-    libplds4.so libplc4.so libnspr4.so
-do
-    ln -sv xulrunner-&xulrunner-version;/$DL /usr/lib
+<screen role="root"><userinput>for DL in libnss3.so libnssutil3.so libsmime3.so \
+  libssl3.so libsoftokn3.so  libplds4.so libplc4.so libnspr4.so
+do ln -sv xulrunner-&xulrunner-version;/${DL} /usr/lib
 done &&
 unset DL</userinput></screen>
 
@@ -331,10 +179,9 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>echo "Requires: nspr"
-    >>xulrunner/installer/libxul-embedding.pc.in</command>: If you try to build
+    <para><command>sed ... Requires: nspr</command>: If you try to build
     <application>Yelp</application> without this, the
-    prtypes header from NSPR will not be found.  It is arguable whose error this
+    prtypes header from NSPR will not be found. It is arguable whose error this
     is (the code presumably works on earlier geckos), but this fix is unlikely
     to cause any damage in other packages.</para>
 
@@ -342,11 +189,7 @@
     packaged to allow the use of a configuration file which can be used to
     pass the configuration settings to the <command>configure</command>
     command. <command>make</command> uses the <filename>client.mk</filename>
-    file to get initial configuration and setup parameters, then depending on
-    the target parameter (<parameter>build</parameter> or
-    <parameter>install</parameter>), either runs the
-    <command>configure</command> script and compiles the package or installs
-    the package.</para>
+    file to get initial configuration and setup parameters.</para>
 
     <para><command>for DL in ...</command>: The NSPR and NSS libraries shipped
     with this package are installed into
@@ -356,16 +199,14 @@
     and the links can be easily changed to point to a newer version during an
     upgrade.</para>
 
-    <para><command>ln -sv /usr/lib/xulrunner-&xulrunner-version;/plugins
-    /usr/lib/mozilla</command>: Some packages will install browser plugins
-    into <filename class='directory'>/usr/lib/mozilla/plugins</filename>.
-    Creating this as a symlink to the <application>Xulrunner</application>
-    plugins keeps additional plugins in a common directory.</para>
+    <para><command>ln -sv ../mozilla/plugins ...</command>: Some packages will
+    install browser plugins into
+    <filename class='directory'>/usr/lib/mozilla/plugins</filename>.
+    Creating this symlink <application>Xulrunner</application> keeps additional
+    plugins in a common directory.</para>
 
    <note>
-     <para>When you upgrade Xulrunner, remember to update the symlinks and to
-     copy any additional plugins compiled against this series of Xulrunner to the
-     new plugin directory.</para>
+     <para>When you upgrade Xulrunner, remember to update the symlinks.</para>
    </note>
 
   </sect2>

Modified: trunk/BOOK/xsoft/graphweb/firefox.xml
===================================================================
--- trunk/BOOK/xsoft/graphweb/firefox.xml	2011-11-29 12:24:08 UTC (rev 9032)
+++ trunk/BOOK/xsoft/graphweb/firefox.xml	2011-11-29 14:51:04 UTC (rev 9033)
@@ -79,8 +79,11 @@
     <ulink url="http://sourceforge.net/projects/hunspell/">Hunspell</ulink>,
     <xref linkend="doxygen"/>,
     <xref linkend="gnome-vfs"/> and <xref linkend="libgnomeui"/> (for gnome
-    integration), <xref linkend="libnotify"/>, <xref linkend="nss"/>,
-    <xref linkend="unzip"/>, <xref linkend="wireless_tools"/>,
+    integration), <xref linkend="libnotify"/>, <xref linkend="nspr"/>,
+    <xref linkend="nss"/>, <xref linkend="xulrunner"/> (linking against an
+    installed xulrunner makes Firefox about 2 MB smaller, which is trivial
+    compared to the size of xulrunner), <xref linkend="unzip"/>,
+    <xref linkend="wireless_tools"/>,
     <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing
     the jemalloc code) and <xref linkend="wget"/></para>
 
@@ -97,14 +100,12 @@
     the desired configuration options. A default <filename>mozconfig</filename>
     is created below. To see the entire list of available configuration options
     (and an abbreviated description of each one), issue
-    <command>./configure --help</command>. <!--If you are not building against
-    <application>Xulrunner</application> you must comment the 'Xulrunner'
-    items. --> You may also wish to review the entire file and uncomment any
-    other desired options. Create the file by issuing the following
-    command:</para>
+    <command>./configure --help</command>. You may also wish to review the
+    entire file and uncomment any other desired options. Create the file by
+    issuing the following command:</para>
 
 <screen><?dbfo keep-together="auto"?><userinput>cat > mozconfig << "EOF"
-<literal># If you have a multicore machine you can speed up the build by running
+# If you have a multicore machine you can speed up the build by running
 # several jobs at once, but if you have a single core, delete this line:
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
@@ -114,6 +115,14 @@
 # If you have installed wireless-tools you can delete this option:
 ac_add_options --disable-necko-wifi
 
+# If you have installed nss uncomment these two lines:
+# ac_add_options --with-system-nspr
+# ac_add_options --with-system-nss
+
+# If you have installed xulrunner uncomment these two lines:
+# ac_add_options --with-system-libxul
+# ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-&xulrunner-version;
+
 # Uncomment these if you have installed them:
 # ac_add_options --enable-system-sqlite
 # ac_add_options --enable-system-lcms
@@ -121,8 +130,8 @@
 # ac_add_options --enable-startup-notification
 
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build-dir
-ac_add_options --enable-official-branding
-ac_add_options --prefix=/usr
+ac_add_options --enable-official-branding<!-- ac_add_options -
+-prefix=/usr -->
 ac_add_options --enable-application=browser
 ac_add_options --enable-pthreads
 ac_add_options --enable-system-ffi
@@ -136,15 +145,9 @@
 ac_add_options --disable-crashreporter
 ac_add_options --disable-installer
 ac_add_options --disable-updater
-ac_add_options --disable-tests</literal>
+ac_add_options --disable-tests
 EOF</userinput></screen>
 
-<!--
-# Point to the Xulrunner libraries - comment these for a standalone browser.
-ac_add_options - -with-system-libxul
-ac_add_options - -with-libxul-sdk=/usr/lib/xulrunner-devel-&xulrunner-version;
--->
-
     <para>Compile <application>Firefox</application> by issuing the
     following commands:</para>
 
@@ -155,11 +158,12 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user,
     install the package:</para>
 
-<screen role="root"><userinput>make -C firefox-build-dir install &&
+<screen role="root"><userinput>make -C firefox-build-dir/browser/installer &&
+tar -xfv firefox-build-dir/dist/firefox-*.tar.bz2 -C /usr/lib &&
+ln -sfv ../lib/firefox/firefox /usr/bin/firefox &&
 mkdir -p /usr/lib/mozilla/plugins &&
-ln -sv ../mozilla/plugins /usr/lib/firefox-&firefox-version; &&
-chown -R -v root:root /usr/{include,lib,share/idl}/firefox-&firefox-version; &&
-chown -R -v root:root /usr/lib/firefox-devel-&firefox-version;</userinput></screen>
+ln -sv ../mozilla/plugins /usr/lib/firefox &&
+chown -R -v root:root /usr/{include,lib,share/idl}/firefox-*</userinput></screen>
 
   </sect2>
 
@@ -172,9 +176,15 @@
     command. <command>make</command> uses the <filename>client.mk</filename>
     file to get initial configuration and setup parameters.</para>
 
-    <para><command>make -C firefox-build-dir install</command>: this runs
-    <command>make install</command> inside the firefox-build-dir folder.</para>
+    <para><command>make -C firefox-build-dir/browser/installer</command>:
+    this creates a <application>Firefox</application> tarball.</para>
 
+    <para><command>tar -xfv firefox-build-dir/dist ...</command>: This untars
+    <application>Firefox</application> in /usr/lib.</para>
+
+    <para><command>ln -sfv ... /usr/bin/firefox</command>: this puts a symbolic
+    link to the <command>firefox</command> executable in your ${PATH}.</para>
+
     <para><command>mkdir -p /usr/lib/mozilla/plugins</command>: this checks
     that /usr/lib/mozilla/plugins exists (if you installed
     <xref linkend="librsvg"/>, it was probably already there).</para>
@@ -196,11 +206,8 @@
         <seg>firefox</seg>
         <seg>Numerous libraries, browser components, plugins, extensions, and
         helper modules installed in <filename
-        class='directory'>/usr/lib/firefox-&firefox-version;</filename></seg>
-        <seg>/usr/include/firefox-&firefox-version;,
-        /usr/lib/firefox-&firefox-version;,
-        /usr/lib/firefox-devel-&firefox-version;, and
-        /usr/share/idl/firefox-&firefox-version;</seg>
+        class='directory'>/usr/lib/firefox</filename></seg>
+        <seg>/usr/lib/firefox</seg>
       </seglistitem>
     </segmentedlist>
 




More information about the blfs-book mailing list