From 879e37fd70c65d37239632bc309ea64d1e4d3dd6 Mon Sep 17 00:00:00 2001
From: Mark Cave-Ayland <mark.cave-ayland@siriusit.co.uk>
Date: Tue, 10 Mar 2009 17:24:25 +0000
Subject: [PATCH] Some documentation updates; change the instructions for
 decompressing the tarballs for PROJ and GEOS so that they work for our
 Solaris friends (as per the instructions for the main PostGIS tarball). Also
 move version entities for GEOS and PROJ into postgis.xml, so that as newer
 versions of PROJ/GEOS are released, we only need to update the version number
 in one location for the change to be reflected throughout the installation
 documentation.

git-svn-id: http://svn.osgeo.org/postgis/trunk@3833 b70326c6-7e19-0410-871a-916f4a2858ee
---
 doc/installation.xml | 12 ++++++------
 doc/postgis.xml      |  6 ++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/doc/installation.xml b/doc/installation.xml
index b2ab32dd2..40bbe4998 100644
--- a/doc/installation.xml
+++ b/doc/installation.xml
@@ -163,9 +163,9 @@ ldconfig</programlisting>
 		
 		<listitem>
 			<para>If you are missing proj based on above or running a version below 4.5, then install by following these steps.</para>
-			<programlisting>wget http://download.osgeo.org/proj/proj-4.6.0.tar.gz
-tar xvzf proj-4.6.0.tar.gz
-cd proj-4.6.0
+			<programlisting>wget http://download.osgeo.org/proj/proj-&last_proj_release_version;.tar.gz
+gzip -d -c proj-&last_proj_release_version;.tar.gz | tar xvf -
+cd proj-&last_proj_release_version;
 ./configure &amp;&amp; make clean &amp;&amp; make
 make install
 ldconfig
@@ -174,9 +174,9 @@ cd ..</programlisting>
 		
 		<listitem>
 			<para>If you are missing geos based on above or running a version below 3.0, then install by following these steps.</para>
-			<programlisting>wget http://download.osgeo.org/geos/geos-3.0.3.tar.bz2
-tar xvjf geos-3.0.3.tar.bz2
-cd geos-3.0.3
+			<programlisting>wget http://download.osgeo.org/geos/geos-&last_geos_release_version;.tar.bz2
+bunzip2 -d -c geos-&last_geos_release_version;.tar.bz2 | tar xvf -
+cd geos-&last_geos_release_version;
 ./configure &amp;&amp; make clean &amp;&amp; make
 make install
 ldconfig
diff --git a/doc/postgis.xml b/doc/postgis.xml
index 77d10eef6..2a4994d06 100644
--- a/doc/postgis.xml
+++ b/doc/postgis.xml
@@ -2,7 +2,13 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 
+<!-- This value is automatically generated by the Makefile -->
 <!ENTITY last_release_version "@@LAST_RELEASE_VERSION@@">
+
+<!-- Change these values to update the version numbers referenced within the documentation -->
+<!ENTITY last_proj_release_version "4.6.1">
+<!ENTITY last_geos_release_version "3.0.3">
+
 <!ENTITY introduction SYSTEM "introduction.xml">
 <!ENTITY installation SYSTEM "installation.xml">
 <!ENTITY faq SYSTEM "faq.xml">
-- 
2.50.0