Author: jbronn
Date: 2010-06-23 12:38:47 -0500 (Wed, 23 Jun 2010)
New Revision: 13399

Modified:
   
django/branches/releases/1.2.X/docs/ref/contrib/gis/create_template_postgis-1.4.sh
   django/branches/releases/1.2.X/docs/ref/contrib/gis/install.txt
Log:
[1.2.X] Fixed #13671, #13748 -- Fixed errata and minor updates to GeoDjango 
docs.

Backport of r13398 from trunk.


Modified: 
django/branches/releases/1.2.X/docs/ref/contrib/gis/create_template_postgis-1.4.sh
===================================================================
--- 
django/branches/releases/1.2.X/docs/ref/contrib/gis/create_template_postgis-1.4.sh
  2010-06-23 17:34:57 UTC (rev 13398)
+++ 
django/branches/releases/1.2.X/docs/ref/contrib/gis/create_template_postgis-1.4.sh
  2010-06-23 17:38:47 UTC (rev 13399)
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-POSTGIS_SQL_PATH=`pg_config --sharedir`/contrib/postgis-1.4
+POSTGIS_SQL_PATH=`pg_config --sharedir`/contrib
 createdb -E UTF8 template_postgis # Create the template spatial database.
 createlang -d template_postgis plpgsql # Adding PLPGSQL language support.
 psql -d postgres -c "UPDATE pg_database SET datistemplate='true' WHERE 
datname='template_postgis';"

Modified: django/branches/releases/1.2.X/docs/ref/contrib/gis/install.txt
===================================================================
--- django/branches/releases/1.2.X/docs/ref/contrib/gis/install.txt     
2010-06-23 17:34:57 UTC (rev 13398)
+++ django/branches/releases/1.2.X/docs/ref/contrib/gis/install.txt     
2010-06-23 17:38:47 UTC (rev 13399)
@@ -383,9 +383,9 @@
 thus it must be compiled from source.  First download the latest amalgamation 
 source archive from the `SQLite download page`__, and extract::
 
-    $ wget http://www.sqlite.org/sqlite-amalgamation-3.6.22.tar.gz
-    $ tar xzf sqlite-amalgamation-3.6.22.tar.gz
-    $ cd sqlite-3.6.22
+    $ wget http://sqlite.org/sqlite-amalgamation-3.6.23.1.tar.gz
+    $ tar xzf sqlite-amalgamation-3.6.23.1.tar.gz
+    $ cd sqlite-3.6.23.1
 
 Next, run the ``configure`` script -- however the ``CFLAGS`` environment 
variable
 needs to be customized so that SQLite knows to build the R*Tree module::
@@ -449,12 +449,9 @@
 .. note::
 
     For Mac OS X users building from source, the SpatiaLite library *and* 
tools 
-    need to be linked into the existing ``iconv`` library. While this happens 
-    automatically on Linux, the ``configure`` scripts need to know about the 
-    specific location on Mac OS X (via modification of the ``CFLAGS`` and 
-    ``LDFLAGS`` environment variables prior to configuration)::
+    need to have their ``target`` configured::
 
-        $ CFLAGS=-I/usr/include LDFLAGS="-L/usr/lib -liconv" ./configure
+        $ ./configure --target=macosx
 
 __ http://www.gaia-gis.it/spatialite/sources.html
 
@@ -804,8 +801,8 @@
     export PATH=/Library/Frameworks/GDAL.framework/Programs:$PATH
     export PATH=/usr/local/pgsql/bin:$PATH
 
-__ http://www.kyngchaos.com/wiki/software:frameworks
-__ http://www.kyngchaos.com/wiki/software:postgres
+__ http://www.kyngchaos.com/software/frameworks
+__ http://www.kyngchaos.com/software/postgres
 
 .. note::
 

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to