Support Fedora 15 as a target in Makefile.install

Add Fedora 15 to the Makefile.install as a simple clone of the Fedora 14
target for now. Correct Makefile.install target names in README, and
point out that nothing special is required for Fedora 15 for PostgreSQL
9 support.

While we're in the README, rip out the Dojo toolkit install info as
packaged releases include Dojo now (we retain the developer instructions
for installing Dojo manually for git users, of course).

Signed-off-by: Dan Scott <dscott@laurentian.ca>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 263989a..2a3afa7 100644 (file)
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -266,6 +266,7 @@ rhel: install_redhat_pgsql centos_like
 centos_like: install_centos_rpms install_yaz install_cpan_marc install install_centos_perl create_ld_local install_cpan_safe install_cpan_force
 
 fedora14: install_fedora_rpms install_cpan install_cpan_fedora install_cpan_marc install_js_sm install_cpan_force
+fedora15: fedora14
 
 debian-squeeze: squeeze generic_debian
 squeeze: install_pgsql_client_debs_90  install_extra_debs_squeeze

diff --git a/README b/README
index 4ac7ab0..cde0430 100644 (file)
--- a/README
+++ b/README
@@ -29,14 +29,17 @@ deb http://archive.ubuntu.com/ubuntu lucid-backports main universe multiverse re
   * On Fedora 14, follow the http://yum.pgrpms.org/howtoyum.php[instructions
     in the Yum HOWTO] to enable the PostgreSQL RPM Building Project yum
     repository.
+  * Fedora 15 comes with PostgreSQL 9, so no additional steps are required.
 +
-3. On Debian and Ubuntu, the easiest way to install the rest of the
+3. On Debian and Ubuntu, run `aptitude update` to retrieve the new packages
+   from the backports repository.
+4. On Debian and Ubuntu, the easiest way to install the rest of the
    prerequisites for Evergreen is to use the Makefile.install prerequisite
    installer.
-4. Issue the following commands as the root user to install prerequisites
+5. Issue the following commands as the root user to install prerequisites
    using the Makefile.install prerequisite installer, substituting
-   `debian-squeeze`, `fedora-14`, `ubuntu-lucid`, `centos`, or `rhel` for
-   <osname> below:
+   `debian-squeeze`, `fedora15`, `fedora14`, `ubuntu-lucid`, `centos`, or
+   `rhel` for <osname> below:
 +
 [source, bash]
 ------------------------------------------------------------------------------
@@ -79,25 +82,6 @@ This will install Evergreen, including example configuration files in
 The `STAFF_CLIENT_STAMP_ID` variable stamps the server-side and client-side files
 for the staff client to ensure that they match.
 
-Install Dojo Toolkit:
----------------------
-
-Evergreen uses the Dojo Toolkit to support its Web and staff client interfaces.
-
-Download the Dojo Toolkit (Dojo + Dijit + DojoX) from
-http://dojotoolkit.org/downloads
-
-Issue the following commands as the root user to fetch, extract, and copy the
-files into the correct directory, adjusting the version number to match the
-version of the Dojo Toolkit that you downloaded:
-
-[source, bash]
-------------------------------------------------------------------------------
-wget http://download.dojotoolkit.org/release-1.3.3/dojo-release-1.3.3.tar.gz
-tar -C /openils/var/web/js -xzf dojo-release-1.3.3.tar.gz
-cp -r /openils/var/web/js/dojo-release-1.3.3/* /openils/var/web/js/dojo/.
-------------------------------------------------------------------------------
-
 Create the oils_web.xml configuration file:
 -------------------------------------------
 Many administration interfaces, such as acquisitions, bookings, and various
@@ -236,8 +220,8 @@ version of Dojo as follows:
 [source, bash]
 ------------------------------------------------------------------------------
 wget http://download.dojotoolkit.org/release-1.3.3/dojo-release-1.3.3.tar.gz
-tar xzf dojo-release-1.3.3.tar.gz
-cp -r dojo-release-1.3.3/* /openils/var/web/js/dojo/.
+tar -C /openils/var/web/js -xzf dojo-release-1.3.3.tar.gz
+cp -r /openils/var/web/js/dojo-release-1.3.3/* /openils/var/web/js/dojo/.
 ------------------------------------------------------------------------------
 
 Getting help: