Changeset 89c9c781


Ignore:
Timestamp:
11/29/2011 02:51:04 PM (13 years ago)
Author:
Andrew Benton <andy@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 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, gimp3, 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/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal
Children:
01ce75f8
Parents:
875b4070
Message:

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

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

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    r875b4070 r89c9c781  
    570570<!ENTITY goffice-version              "0.8.10">
    571571<!ENTITY mesalib-version              "7.9">
    572 <!ENTITY xulrunner-version            "1.9.2.13">
     572<!ENTITY xulrunner-version            "8.0.1">
    573573<!ENTITY webkitgtk-version            "1.2.5">
    574574<!ENTITY libsexy-version              "0.1.11">

  • introduction/welcome/changelog.xml

    r875b4070 r89c9c781  
    5151          <para>[wblaszcz] - Updated to polkit-0.102.</para>
    5252        </listitem>
     53        <listitem>
     54          <para>[abenton] - Updated to xulrunner to 8.0.1.</para>
     55        </listitem>
    5356      </itemizedlist>
    5457    </listitem>

  • x/lib/xulrunner.xml

    r875b4070 r89c9c781  
    88  <!ENTITY xulrunner-download-ftp  "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
    99  <!-- md5sum and size should match firefox, but the buildsize and time will differ -->
    10   <!ENTITY xulrunner-md5sum        "d7c90aed8209beefa74badf02e8eeae1">
    11   <!ENTITY xulrunner-size          "51 MB">
    12   <!ENTITY xulrunner-buildsize     "820 MB">
    13   <!ENTITY xulrunner-time          "20 SBU">
     10  <!ENTITY xulrunner-md5sum        "b7d09b082e88a74860a51a8e04e29333">
     11  <!ENTITY xulrunner-size          "67 MB">
     12  <!ENTITY xulrunner-buildsize     "2.6 GB">
     13  <!ENTITY xulrunner-time          "22 SBU">
    1414]>
    1515
    … …  
    3232
    3333    <para><application>Xulrunner</application> is a runtime environment for XUL
    34     applications, and forms the major part of the <application>Mozilla</application>
    35     codebase.  In particular, it provides the gecko engine together with pkgconfig
    36     files so that applications such as <application>Yelp</application> can find
    37     and use it.  However, be aware that Gnome applications are transitioning to
    38     <application>Webkit</application> instead of gecko.</para>
    39 
    40     &lfs67_checked;
     34    applications, and forms the major part of the
     35    <application>Mozilla</application> codebase. In particular, it provides the
     36    gecko engine together with pkgconfig files so that applications such as
     37    <application>Yelp</application> can find and use it.  However, be aware that
     38    Gnome applications are transitioning to <application>Webkit</application>
     39    instead of gecko.</para>
     40
     41    &lfs70_checked;
    4142    <para>&lfssvn_checked;20101029&lfssvn_checked2;</para>
    4243
    … …  
    4849      <listitem>
    4950        <para>Download (FTP): <ulink url="&xulrunner-download-ftp;"/></para>
    50         <tip><para>When a new version of <application>Firefox</application> is
    51         released, sometimes a corresponding new version of
    52         <application>Xulrunner</application> appears at the same time. At other
    53         times it appears several days later or not at all. So far in the
    54         <application>Firefox-3.x</application> series, every new release has
    55         created xulrunner libraries with a corresponding new version. Whenever
    56         a separate Xulrunner tarball has been released, it has been bitwise
    57         identical to the corresponding Firefox tarball. Use the
    58         <application>Firefox</application> tarball to save downloading this
    59         large package twice.</para></tip>
    6051      </listitem>
    6152      <listitem>
    … …  
    6657      </listitem>
    6758      <listitem>
    68         <para>Estimated disk space required: &xulrunner-buildsize; (using
    69         all dependencies)</para>
    70       </listitem>
    71       <listitem>
    72         <para>Estimated build time: &xulrunner-time; (using all
    73         dependencies)</para>
     59        <para>Estimated disk space required: &xulrunner-buildsize;</para>
     60      </listitem>
     61      <listitem>
     62        <para>Estimated build time: &xulrunner-time;</para>
    7463      </listitem>
    7564    </itemizedlist>
    7665
    77     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    78     <itemizedlist spacing="compact">
    79       <listitem>
    80         <para>Optional patch: <ulink
    81         url="&patch-root;/firefox-&firefox-version;-provide_system_nspr_nss-1.patch"/>
    82         (Required if using the included NSPR and NSS libraries as system versions for
    83         other packages)</para>
    84       </listitem>
    85     </itemizedlist>
    86 
    8766    <bridgehead renderas="sect3">Xulrunner Dependencies</bridgehead>
    8867
    8968    <bridgehead renderas="sect4">Required</bridgehead>
    90     <para role="required"><xref linkend="alsa-lib"/>,
    91     <xref linkend="gtk2"/>,
    92     <xref linkend="libidl"/>,
    93     <xref linkend="pango"/>,
    94     <xref linkend="python"/>, and
    95     <xref linkend="zip"/></para>
    96 
    97     <para>Note: <application>libjpeg</application> should have been installed
    98     before <application>GTK+</application> and should exist on your system. If
    99     for some reason you haven't installed <application>libjpeg</application>,
    100     you should remove the <option>--with-system-jpeg</option> option from the
     69    <para role="required"><xref linkend="alsa-lib"/>, <xref linkend="gtk2"/>,
     70    <xref linkend="libidl"/> and <xref linkend="zip"/></para>
     71
     72    <para>Note: <application>libjpeg</application> and
     73    <application>libpng</application> (patched for apng support) should have
     74    been installed before <application>gdk-pixbuf</application> and should
     75    exist on your system. If for some strange reason you haven't installed
     76    them, you should remove the <option>--with-system-jpeg</option> and
     77    <option>--with-system-png</option> options from the
    10178    <filename>mozconfig</filename> file created below.</para>
    102 
    103     <bridgehead renderas="sect4">Recommended</bridgehead>
    104     <para role="recommended"><xref linkend="sqlite"/> (internal sqlite is
    105     incompatable with existing or future installations)</para>
    10679
    10780    <bridgehead renderas="sect4">Optional</bridgehead>
    10881    <para role="optional"><xref linkend="dbus-glib"/>,
     82    <xref linkend="startup-notification"/>, <xref linkend="sqlite"/>,
     83    <ulink url="http://www.webmproject.org/code/">libvpx</ulink>,
     84    <ulink url="http://sourceforge.net/projects/hunspell/">Hunspell</ulink>,
    10985    <xref linkend="doxygen"/>,
    110     <xref linkend="curl"/> (only for crash-reporter),
    111     <xref linkend="gnome-vfs"/> and <xref linkend="libgnomeui"/> (for gnome integration),
    112     <xref linkend="libnotify"/>,
    113     <xref linkend="libpng"/> (patched for apng support),
    114     <xref linkend="nss"/> (recommended if you build any other Mozilla.org packages),
    115     <xref linkend="startup-notification"/>,
    116     <xref linkend="unzip"/>,
    117     <ulink url="http://sourceforge.net/projects/hunspell/">Hunspell</ulink>,
    118     <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing the jemalloc code), and
    119     <xref linkend="wget"/></para>
     86    <xref linkend="gnome-vfs"/> and <xref linkend="libgnomeui"/> (for gnome
     87    integration), <xref linkend="libnotify"/>, <xref linkend="nspr"/>,
     88    <xref linkend="nss"/>, <xref linkend="unzip"/>,
     89    <xref linkend="wireless_tools"/>,
     90    <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing
     91    the jemalloc code) and <xref linkend="wget"/></para>
    12092
    12193    <para condition="html" role="usernotes">User Notes:
    … …  
    133105    (and an abbreviated description of each one), issue
    134106    <command>./configure --help</command>. You should review the entire file
    135     and comment or uncomment options as necessary. If you would prefer to
    136     download the file instead of creating it by typing or cut-and-pasting, you
    137     can find it at
    138     <ulink url="&files-anduin;/xulrunner-&xulrunner-version;-mozconfig"/>
    139     (the file must be installed in the root of the source tree, and named
    140     <filename>mozconfig</filename> or <filename>.mozconfig</filename>).</para>
     107    and comment or uncomment options as necessary.</para>
    141108
    142109<screen><?dbfo keep-together="auto"?><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
    143 <literal># This file contains the options used in the Xulrunner build. You may
    144 # need to specify additional options for your specific build needs.
    145 # Use the information provided by running './configure --help' to
    146 # help you determine if you need to add any additional options.
    147 # Some additional options can be added by uncommenting the examples
    148 # in this file or adding options by inserting a line containing
    149 # 'ac_add_options --some-option-you-need'.  Be aware that some accepted
    150 # options, such as '--with-system-bz2', do not affect the build.
    151 
    152 # Specify that Xulrunner should be built. Note that this line is commented out
    153 # because it is redundant with the next setting.
    154 #ac_add_options --enable-application=xulrunner
    155 
    156 # Use the default settings specified in the source tree. The
    157 # --enable-application=xulrunner is set in this file.
    158 . $topsrcdir/xulrunner/config/mozconfig
    159 
    160 # Create an object directory and specify to build the package in that
    161 # directory. If desired, modify the location of the object directory
    162 # to a directory inside the source tree by removing '../' from the
    163 # line below.
    164 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../xulrunner-build
    165 
    166 # Specify the installation prefix. If you would prefer Xulrunner installed in a
    167 # different prefix, modify the line below to fit your needs (the system.conf
    168 # configuration file will always be installed to /etc/gre.d).
    169 ac_add_options --prefix=/usr
    170 
    171 # Apply a minimal level of optimization (-O).
    172 ac_add_options --enable-optimize
    173 
    174 # These options are used so that the Xulrunner binaries are linked to
    175 # the system-installed copies of the specified libraries instead of
    176 # the source tree code which may not be the most recent versions.
    177 # With the exception of libsqlite3, the libraries are statically linked.
    178 
    179 # (Options to use system installed libraries)
    180 # Using the shipped version of libsqlite3 has been reported to cause
    181 # problems with other applications which were using sqlite3.
    182 # Only comment this line if you know exactly what you are doing!
    183 ac_add_options --enable-system-sqlite
    184 
    185 # Comment this only if you want to use whatever patched version of cairo
    186 # is in the shipped mozilla tree, together with the system headers.
    187 ac_add_options --enable-system-cairo
    188 
    189 # Comment this if you have not installed lcms.
    190 ac_add_options --enable-system-lcms
    191 
    192 # Uncomment this if you have installed Hunspell
    193 #ac_add_options --enable-system-hunspell
    194 
    195 # Uncomment this if you have installed startup-notification
    196 #ac_add_options --enable-startup-notification
    197 
    198 # Comment this if you did not build libjpeg before GTK+-2.
    199 ac_add_options --with-system-jpeg
    200 
    201 # These two options enable support for building Xulrunner with
    202 # system-installed versions of the Network Security Services (NSS)
    203 # and Netscape Portable Runtime (NSPR) libraries. Comment them if
    204 # you wish to use the included copies (not recommended).
     110<literal># If you have a multicore machine you can speed up the build by running
     111# several jobs at once, but if you have a single core, delete this line:
     112mk_add_options MOZ_MAKE_FLAGS="-j4"
     113
     114# If you have installed DBus-Glib you can delete this option:
     115ac_add_options --disable-dbus
     116
     117# If you have installed wireless-tools you can delete this option:
     118ac_add_options --disable-necko-wifi
     119
     120# If you have not installed nss delete these two lines:
    205121ac_add_options --with-system-nspr
    206122ac_add_options --with-system-nss
    207123
    208 # Comment this if you have not built png with the apng patch.
    209 ac_add_options --with-system-png
    210 
    211 # The pthreads option is only used when building nspr
    212 # Uncomment this if you build the included nspr.
    213 #ac_add_options --with-pthreads
    214 
    215 # Zlib is included in LFS. Do not comment this line.
    216 ac_add_options --with-system-zlib
    217 
    218 # (Options to disable parts of the package)
    219 # This option is used to disable the a11y support in the Xulrunner
    220 # binaries. Comment out this option if you require a11y support.
    221 ac_add_options --disable-accessibility
    222 
    223 # Uncomment this if you did not build cURL.
    224 #ac_add_options --disable-crashreporter
    225 
    226 # Comment this if you have built DBus-Glib.
    227 ac_add_options --disable-dbus
    228 
    229 # Comment this if you have Gnome-VFS and libgnomeui, and wish to
    230 # integrate Xulrunner into your Gnome desktop.
    231 ac_add_options --disable-gnomevfs
    232 
    233 # Comment this if you have wireless-tools installed and wish to use the new
    234 # Necko WiFi scanning.
    235 ac_add_options --disable-necko-wifi
    236 
    237 # Comment this if you have installed libnotify.
    238 ac_add_options --disable-libnotify
    239 
    240 # This option is added so that the Mozilla Installer program is not
    241 # built or installed. The program is not required for a BLFS
    242 # installation of Xulrunner.
     124# Uncomment these if you have installed them:
     125# ac_add_options --enable-system-sqlite
     126# ac_add_options --enable-system-lcms
     127# ac_add_options --with-system-libvpx
     128# ac_add_options --enable-startup-notification
     129
     130mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build-dir
     131ac_add_options --prefix=/usr
     132ac_add_options --enable-application=xulrunner
     133ac_add_options --enable-pthreads
     134ac_add_options --enable-system-ffi
     135ac_add_options --enable-system-jpeg
     136ac_add_options --enable-system-png
     137ac_add_options --enable-system-cairo
     138ac_add_options --enable-system-zlib
     139ac_add_options --enable-shared
     140ac_add_options --disable-static
     141ac_add_options --disable-debug
     142ac_add_options --disable-crashreporter
    243143ac_add_options --disable-installer
    244 
    245 # If you enable javaxpcom, you must have a java compiler installed.
    246 ac_add_options --disable-javaxpcom
    247 
    248 # This option is added so that test libraries and programs are not
    249 # built. These would only be required for debugging purposes.
    250 ac_add_options --disable-tests
    251 
    252 # Disable the updater, which is not appropriate if you build from source.
    253144ac_add_options --disable-updater
    254 
    255 # (options to add extra parts of the package)
    256 # This option causes the installed Firefox binaries to have the official
    257 # Firefox name embedded in them. Due to license restrictions, you
    258 # may not distribute binaries created using this option.  It also
    259 # means you get a popup EULA when you first run a Xulrunner Gecko engined
    260 # application.
    261 ac_add_options --enable-official-branding
    262 
    263 # Use the anti-phishing measures (a blacklist of sites).
    264 ac_add_options --enable-safe-browsing
    265 
    266 # This option is used so that the debugging symbols are removed from
    267 # the installed binaries during the installation process. Comment out
    268 # this option if you may have a need to retain the debugging symbols
    269 # in the installed binaries (the resulting binaries will be about 7MB
    270 # bigger).
    271 ac_add_options --enable-strip
    272 
    273 # Uncomment this option if you desire support for dual-monitor
    274 # display using the X-Window Xinerama libraries.
    275 #ac_add_options --enable-xinerama
    276 
    277 # This option identifies the default binary directory of the Xulrunner
    278 # installation and is used to locate Xulrunner's installed files. This
    279 # option is is only used for development purposes.
    280 #ac_add_options --with-default-mozilla-five-home=/usr/lib/xulrunner-&xulrunner-version;</literal>
    281 
     145ac_add_options --disable-tests</literal>
    282146EOF</userinput></screen>
    283 
    284     <para>If you did not install <xref linkend="nspr"/> and
    285     <xref linkend="nss"/>, then apply the patch with the following
    286     command:</para>
    287 
    288 <screen><userinput>patch -Np1 -i ../firefox-&firefox-version;-provide_system_nss_nspr-1.patch</userinput></screen>
    289147
    290148    <para>Install <application>Xulrunner</application> by issuing the
    291149    following commands:</para>
    292150
    293 <screen><userinput>echo "Requires: nspr" >>xulrunner/installer/libxul-embedding.pc.in &amp;&amp;
    294 make -f client.mk build</userinput></screen>
     151<screen><userinput>sed -i '/Version/aRequires: nspr &gt;= 4.8.9' xulrunner/installer/libxul-embedding.pc.in &amp;&amp;
     152make -f client.mk</userinput></screen>
    295153
    296154    <para>This package does not come with a test suite.</para>
    297155
    298     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
    299 
    300 <!-- I really don't think we need the last command to installl symlinks to the
    301      Xul libraries. Any package using Xul is going to use the pkgconfig file to
    302      find the things it needs -->
    303 <screen role="root"><userinput>make -f client.mk install &amp;&amp;
    304 
    305 install -v -m755 -d /usr/lib/mozilla &amp;&amp;
    306 ln -sv              /usr/lib/xulrunner-&xulrunner-version;/plugins \
    307                     /usr/lib/mozilla &amp;&amp;
    308 
    309 chown -Rv root:root /usr/lib/xulrunner-* \
    310                     /usr/share/idl/xulrunner-&xulrunner-version; \
    311                     /usr/include/xulrunner-&xulrunner-version;</userinput></screen>
    312                    
    313 <!-- commented out per discussion on BLFS-Dev
    314 ln -sfv             xulrunner-devel-&xulrunner-version;/lib/lib{xul,xpcom,mozjs}.so \
    315                     /usr/lib</userinput></screen> -->
    316 
    317     <para>If you elected to use the included NSPR and NSS, while still the
     156    <para>Now, as the <systemitem class="username">root</systemitem>
     157    user:</para>
     158
     159<screen role="root"><userinput>make -C xulrunner-build-dir install &amp;&amp;
     160mkdir -p /usr/lib/mozilla &amp;&amp;
     161rm -rf /usr/lib/xulrunner-&xulrunner-version;/plugins &amp;&amp;
     162ln -sv ../mozilla/plugins /usr/lib/xulrunner-&xulrunner-version; &amp;&amp;
     163chown -Rv root:root /usr/{include,lib,share/idl}/xulrunner-*</userinput></screen>
     164
     165    <para>If you elected to use the included NSPR and NSS (ie, if you have
     166    <emphasis>not</emphasis> installed <xref linkend="nspr"/> and
     167    <xref linkend="nss"/>), while still the
    318168    <systemitem class="username">root</systemitem> user, complete the
    319169    installation with the following commands:</para>
    320170
    321 <screen role="root"><userinput>for DL in \
    322     libnss3.so libnssutil3.so libsmime3.so libssl3.so libsoftokn3.so \
    323     libplds4.so libplc4.so libnspr4.so
    324 do
    325     ln -sv xulrunner-&xulrunner-version;/$DL /usr/lib
     171<screen role="root"><userinput>for DL in libnss3.so libnssutil3.so libsmime3.so \
     172  libssl3.so libsoftokn3.so  libplds4.so libplc4.so libnspr4.so
     173do ln -sv xulrunner-&xulrunner-version;/${DL} /usr/lib
    326174done &amp;&amp;
    327175unset DL</userinput></screen>
    … …  
    332180    <title>Command Explanations</title>
    333181
    334     <para><command>echo "Requires: nspr"
    335     >>xulrunner/installer/libxul-embedding.pc.in</command>: If you try to build
     182    <para><command>sed ... Requires: nspr</command>: If you try to build
    336183    <application>Yelp</application> without this, the
    337     prtypes header from NSPR will not be found.  It is arguable whose error this
     184    prtypes header from NSPR will not be found. It is arguable whose error this
    338185    is (the code presumably works on earlier geckos), but this fix is unlikely
    339186    to cause any damage in other packages.</para>
    … …  
    343190    pass the configuration settings to the <command>configure</command>
    344191    command. <command>make</command> uses the <filename>client.mk</filename>
    345     file to get initial configuration and setup parameters, then depending on
    346     the target parameter (<parameter>build</parameter> or
    347     <parameter>install</parameter>), either runs the
    348     <command>configure</command> script and compiles the package or installs
    349     the package.</para>
     192    file to get initial configuration and setup parameters.</para>
    350193
    351194    <para><command>for DL in ...</command>: The NSPR and NSS libraries shipped
    … …  
    357200    upgrade.</para>
    358201
    359     <para><command>ln -sv /usr/lib/xulrunner-&xulrunner-version;/plugins
    360     /usr/lib/mozilla</command>: Some packages will install browser plugins
    361     into <filename class='directory'>/usr/lib/mozilla/plugins</filename>.
    362     Creating this as a symlink to the <application>Xulrunner</application>
    363     plugins keeps additional plugins in a common directory.</para>
     202    <para><command>ln -sv ../mozilla/plugins ...</command>: Some packages will
     203    install browser plugins into
     204    <filename class='directory'>/usr/lib/mozilla/plugins</filename>.
     205    Creating this symlink <application>Xulrunner</application> keeps additional
     206    plugins in a common directory.</para>
    364207
    365208   <note>
    366      <para>When you upgrade Xulrunner, remember to update the symlinks and to
    367      copy any additional plugins compiled against this series of Xulrunner to the
    368      new plugin directory.</para>
     209     <para>When you upgrade Xulrunner, remember to update the symlinks.</para>
    369210   </note>
    370211

  • xsoft/graphweb/firefox.xml

    r875b4070 r89c9c781  
    8080    <xref linkend="doxygen"/>,
    8181    <xref linkend="gnome-vfs"/> and <xref linkend="libgnomeui"/> (for gnome
    82     integration), <xref linkend="libnotify"/>, <xref linkend="nss"/>,
    83     <xref linkend="unzip"/>, <xref linkend="wireless_tools"/>,
     82    integration), <xref linkend="libnotify"/>, <xref linkend="nspr"/>,
     83    <xref linkend="nss"/>, <xref linkend="xulrunner"/> (linking against an
     84    installed xulrunner makes Firefox about 2 MB smaller, which is trivial
     85    compared to the size of xulrunner), <xref linkend="unzip"/>,
     86    <xref linkend="wireless_tools"/>,
    8487    <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing
    8588    the jemalloc code) and <xref linkend="wget"/></para>
    … …  
    98101    is created below. To see the entire list of available configuration options
    99102    (and an abbreviated description of each one), issue
    100     <command>./configure --help</command>. <!--If you are not building against
    101     <application>Xulrunner</application> you must comment the 'Xulrunner'
    102     items. --> You may also wish to review the entire file and uncomment any
    103     other desired options. Create the file by issuing the following
    104     command:</para>
     103    <command>./configure --help</command>. You may also wish to review the
     104    entire file and uncomment any other desired options. Create the file by
     105    issuing the following command:</para>
    105106
    106107<screen><?dbfo keep-together="auto"?><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
    107 <literal># If you have a multicore machine you can speed up the build by running
     108# If you have a multicore machine you can speed up the build by running
    108109# several jobs at once, but if you have a single core, delete this line:
    109110mk_add_options MOZ_MAKE_FLAGS="-j4"
    … …  
    114115# If you have installed wireless-tools you can delete this option:
    115116ac_add_options --disable-necko-wifi
     117
     118# If you have installed nss uncomment these two lines:
     119# ac_add_options --with-system-nspr
     120# ac_add_options --with-system-nss
     121
     122# If you have installed xulrunner uncomment these two lines:
     123# ac_add_options --with-system-libxul
     124# ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-&xulrunner-version;
    116125
    117126# Uncomment these if you have installed them:
    … …  
    122131
    123132mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build-dir
    124 ac_add_options --enable-official-branding
    125 ac_add_options --prefix=/usr
     133ac_add_options --enable-official-branding<!-- ac_add_options -
     134-prefix=/usr -->
    126135ac_add_options --enable-application=browser
    127136ac_add_options --enable-pthreads
    … …  
    137146ac_add_options --disable-installer
    138147ac_add_options --disable-updater
    139 ac_add_options --disable-tests</literal>
     148ac_add_options --disable-tests
    140149EOF</userinput></screen>
    141 
    142 <!--
    143 # Point to the Xulrunner libraries - comment these for a standalone browser.
    144 ac_add_options - -with-system-libxul
    145 ac_add_options - -with-libxul-sdk=/usr/lib/xulrunner-devel-&xulrunner-version;
    146 -->
    147150
    148151    <para>Compile <application>Firefox</application> by issuing the
    … …  
    156159    install the package:</para>
    157160
    158 <screen role="root"><userinput>make -C firefox-build-dir install &amp;&amp;
     161<screen role="root"><userinput>make -C firefox-build-dir/browser/installer &amp;&amp;
     162tar -xfv firefox-build-dir/dist/firefox-*.tar.bz2 -C /usr/lib &amp;&amp;
     163ln -sfv ../lib/firefox/firefox /usr/bin/firefox &amp;&amp;
    159164mkdir -p /usr/lib/mozilla/plugins &amp;&amp;
    160 ln -sv ../mozilla/plugins /usr/lib/firefox-&firefox-version; &amp;&amp;
    161 chown -R -v root:root /usr/{include,lib,share/idl}/firefox-&firefox-version; &amp;&amp;
    162 chown -R -v root:root /usr/lib/firefox-devel-&firefox-version;</userinput></screen>
     165ln -sv ../mozilla/plugins /usr/lib/firefox &amp;&amp;
     166chown -R -v root:root /usr/{include,lib,share/idl}/firefox-*</userinput></screen>
    163167
    164168  </sect2>
    … …  
    173177    file to get initial configuration and setup parameters.</para>
    174178
    175     <para><command>make -C firefox-build-dir install</command>: this runs
    176     <command>make install</command> inside the firefox-build-dir folder.</para>
     179    <para><command>make -C firefox-build-dir/browser/installer</command>:
     180    this creates a <application>Firefox</application> tarball.</para>
     181
     182    <para><command>tar -xfv firefox-build-dir/dist ...</command>: This untars
     183    <application>Firefox</application> in /usr/lib.</para>
     184
     185    <para><command>ln -sfv ... /usr/bin/firefox</command>: this puts a symbolic
     186    link to the <command>firefox</command> executable in your ${PATH}.</para>
    177187
    178188    <para><command>mkdir -p /usr/lib/mozilla/plugins</command>: this checks
    … …  
    197207        <seg>Numerous libraries, browser components, plugins, extensions, and
    198208        helper modules installed in <filename
    199         class='directory'>/usr/lib/firefox-&firefox-version;</filename></seg>
    200         <seg>/usr/include/firefox-&firefox-version;,
    201         /usr/lib/firefox-&firefox-version;,
    202         /usr/lib/firefox-devel-&firefox-version;, and
    203         /usr/share/idl/firefox-&firefox-version;</seg>
     209        class='directory'>/usr/lib/firefox</filename></seg>
     210        <seg>/usr/lib/firefox</seg>
    204211      </seglistitem>
    205212    </segmentedlist>
Note: See TracChangeset for help on using the changeset viewer.