From 998dcf89c91f298a5e68028bf35a488716a435f4 Mon Sep 17 00:00:00 2001 From: Randy McMurchy Date: Wed, 21 Jun 2006 00:21:03 +0000 Subject: [PATCH] Updated some of the ancillary GNOME2 files git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@6183 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- gnome/core/config.xml | 2 +- gnome/core/pre-install-config.xml | 2 +- gnome/gnome-intro.xml | 106 ++++++++++++++++-------------- gnome/without-gnome.xml | 14 ++-- 4 files changed, 63 insertions(+), 61 deletions(-) diff --git a/gnome/core/config.xml b/gnome/core/config.xml index 56f9d2892b..f5f17394b2 100644 --- a/gnome/core/config.xml +++ b/gnome/core/config.xml @@ -31,7 +31,7 @@ Check the ~/.xinitrc file and ensure you have no other window managers or other X applications - starting before GNOME. + mentioned before GNOME. Ensure all libraries can be found with (as diff --git a/gnome/core/pre-install-config.xml b/gnome/core/pre-install-config.xml index 88466a8f42..1ef8b2ebc3 100644 --- a/gnome/core/pre-install-config.xml +++ b/gnome/core/pre-install-config.xml @@ -54,7 +54,7 @@ EOF cat >> /etc/man_db.conf << "EOF" # Begin gnome addition to man_db.conf -MANDATORY_MANPATH /opt/gnome-&gnome-version;&gnome-minor-version;/man +MANDATORY_MANPATH /opt/gnome-&gnome-version;&gnome-minor-version;/share/man # End gnome addition to man_db.conf EOF diff --git a/gnome/gnome-intro.xml b/gnome/gnome-intro.xml index 598507d4b5..37f7ed44c7 100644 --- a/gnome/gnome-intro.xml +++ b/gnome/gnome-intro.xml @@ -10,64 +10,55 @@ Introduction to GNOME This chapter presents the instructions to install a complete - GNOME-&gnome-version;&gnome-minor-version; - desktop environment and a limited GNOME 1.4 - library environment that is sufficient to run - GNOME 1.4 applications included in this book. - The order of the pages follow the build order defined by the - GNOME development team as published in previous - versions of the - release notes. Note that the development team did not publish a - build order for the &gnome-version;&gnome-minor-version; release. + GNOME-&gnome-version;&gnome-minor-version; desktop environment; and a limited + GNOME 1.4 library environment that is sufficient to run GNOME 1.4 + applications included in this book. The order of the pages follows the build + order defined by the GNOME development team and documented in the + Release Notes. - The installation of - GNOME-&gnome-version;&gnome-minor-version; - is a large undertaking and one we would like to see you complete with the - least amount of stress. One of the first goals in this installation is to - protect your previously installed software, especially if you are testing - GNOME on your machine. - GNOME-&gnome-version; packages utilize the + The installation of GNOME-&gnome-version;&gnome-minor-version; is a + large undertaking and one we would like to see you complete with the least + amount of stress. One of the first goals in this installation is to protect + your previously installed software, especially if you are testing GNOME on + your machine. GNOME-&gnome-version; packages utilize the passed to configure, so you will use that and an environment variable (GNOME_PREFIX) to add flexibility to the installation. - To install GNOME as your desktop of choice, - it is recommended that you install using - . If you are not sure that you are going - to keep the GNOME installation, or you think you - will update to the newest releases as they become available, you should - install with . - Setting the environment variable and the additional edits required by the - second option are covered on the pre-installation page. + To install GNOME as your desktop of choice, it is recommended that you + install using . If you are not sure that you + are going to keep the GNOME installation, or you think you will update to the + newest releases as they become available, you should install with + . Setting the environment + variable and the additional edits required by the second option are covered + in the Pre-Installation Configuration section. If you choose the second option, removal of - GNOME-&gnome-version;&gnome-minor-version; is as - easy as removing the edits from the pre-installation page and issuing the - following command: + GNOME-&gnome-version;&gnome-minor-version; is as easy as removing the edits + from the pre-installation page and issuing the following command (you may + need to become the root + user): rm -rf /opt/gnome-&gnome-version; If your system was completely built per LFS and BLFS instructions, you have a very good chance of using - GNOME-&gnome-version;&gnome-minor-version; after - your first installation. If you are a typical LFS user, you have made - modifications to the instructions along the way knowing that you have to - take those modifications into account on future installations. You should - have no problems integrating - GNOME-&gnome-version;&gnome-minor-version; into - your unique setup, but you will have to install almost 50 packages before - you can run GNOME through any testing (assuming - your window manager is preinstalled and tested). You should anticipate that - you will be rebuilding GNOME at least once to - make adjustments for your setup. + GNOME-&gnome-version;&gnome-minor-version; after your first installation. If + you are a typical LFS user, you have made modifications to the instructions + along the way knowing that you have to take those modifications into account + on future installations. You should have no problems integrating + GNOME-&gnome-version;&gnome-minor-version; into your unique setup, but you + will have to install well over 50 packages before you can run GNOME through + any testing (assuming your windowing system is preinstalled and tested). You + should anticipate that you will be rebuilding GNOME at least once to make + adjustments for your setup. - If you are building a GNOME 1.4 desktop - environment, you would install only those libraries in the - GNOME 1.4 chapter and any - dependencies listed on those pages, whether labeled or not. - GNOME packages without pages are simply - installed with: + If you are building a GNOME 1.4 library environment, you would install + only those libraries in the GNOME 1.4 chapter + and any dependencies listed on those + pages, whether labeled or not. GNOME packages without pages in the book are + simply installed with: ./configure --prefix=/opt/gnome-1.4 && make @@ -77,15 +68,28 @@ make make install These instructions are simplistic to facilitate removal of - GNOME 1.4 from BLFS systems when it is no longer - necessary. These instructions may be refined later to comply with BLFS - standards for file locations, specifically + GNOME 1.4 from BLFS systems when it is no longer necessary. These + instructions may be refined later to comply with BLFS standards for file + locations, specifically /opt/gnome/etc to /etc and /opt/gnome/var to /var. You should consider using - the GNOME 1.4 hint located at - if you have no interest in - GNOME-&gnome-version;&gnome-minor-version;. + the GNOME 1.4 hint located at if you have no + interest in GNOME-&gnome-version;&gnome-minor-version;. + + Alternate Installation Methods + As was previously mentioned, building a GNOME desktop from sources is + a significant project. Some may find it too tedious or time-consuming to + perform a full installation following the BLFS book. You may wish to review + the automated methods mentioned in the + GNOME-&gnome-version;&gnome-minor-version; Release + Notes. Note that using any other method to install + GNOME-&gnome-version;&gnome-minor-version; other than using the BLFS + instructions cannot be supported by the BLFS team. Alternate methods are only + mentioned as a courtesy to builders who would like to build GNOME from + sources but do not have the time/desire/patience/whatever to follow the + BLFS book. diff --git a/gnome/without-gnome.xml b/gnome/without-gnome.xml index a7dc7e05e3..8ac85ced82 100644 --- a/gnome/without-gnome.xml +++ b/gnome/without-gnome.xml @@ -3,12 +3,10 @@ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" > - The instructions below are based on installing the package into - a GNOME-2 environment. If, for whatever - reason, you're installing this package without having - ORBit2 and the core - GNOME-2 libraries installed, you'll need to - modify the parameter on the - configure script to point to your desired installation - path (e.g., ). + The instructions below are based on installing the package into a + GNOME-2 environment. If, for whatever reason, you're installing this package + without having ORBit2 and the core GNOME-2 + libraries installed, you'll need to modify the + parameter on the configure script to point to your desired + installation path (e.g., ).