jan: thuban/test postgissupport.py,1.7.2.4,1.7.2.5

[cvs@intevation.de]

Author: jan

Update of /thubanrepository/thuban/test
In directory doto:/tmp/cvs-serv30276

Modified Files:
      Tag: thuban-1-0-branch
	postgissupport.py 
Log Message:
Backport from HEAD:
(find_postgis_sql): Added yet another
potential location for (lw)postgis.sql because the file has moved
again in postgis 1.0.0 rc4.


Index: postgissupport.py
===================================================================
RCS file: /thubanrepository/thuban/test/postgissupport.py,v
retrieving revision 1.7.2.4
retrieving revision 1.7.2.5
diff -u -d -r1.7.2.4 -r1.7.2.5
--- postgissupport.py	25 Jan 2005 09:31:18 -0000	1.7.2.4
+++ postgissupport.py	5 Apr 2005 21:24:50 -0000	1.7.2.5
@@ -484,6 +484,7 @@
       postgis 0.7.5        $datadir/contrib/postgis.sql
       postgis 0.8.1        $datadir/postgis.sql
       postgis 1.0.0-rc1    $datadir/lwpostgis.sql
+      postgis 1.0.0-rc4    $datadir/contrib/lwpostgis.sql
 
     To support both versions, we look in both places and return the
     first one found (looking under contrib first).  If the file is not
@@ -493,7 +494,8 @@
     datadir = os.path.join(bindir, "..", "share", "postgresql")
     for filename in [os.path.join(datadir, "contrib", "postgis.sql"),
                      os.path.join(datadir, "postgis.sql"),
-                     os.path.join(datadir, "lwpostgis.sql")]:
+                     os.path.join(datadir, "lwpostgis.sql"),
+                     os.path.join(datadir, "contrib", "lwpostgis.sql")]:
         if os.path.exists(filename):
             return filename