[postgis-commits] svn - r3687 - in trunk: . regress topology

[postgis-commits at postgis.refractions.net]

Author: pramsey
Date: 2009-02-11 10:28:53 -0800 (Wed, 11 Feb 2009)
New Revision: 3687

Modified:
   trunk/GNUmakefile
   trunk/README.postgis
   trunk/STYLE
   trunk/configure.ac
   trunk/make_dist.sh
   trunk/regress/Makefile.in
   trunk/topology/topology.sql.in.c
Log:
Change references from ./lwgeom to ./postgis


Modified: trunk/GNUmakefile
===================================================================
--- trunk/GNUmakefile	2009-02-11 18:22:32 UTC (rev 3686)
+++ trunk/GNUmakefile	2009-02-11 18:28:53 UTC (rev 3687)
@@ -24,7 +24,7 @@
 	@echo 'deletes files that may need special tools to rebuild.'
 	@echo '------------------------------------------------------'
 	$(MAKE) -C doc maintainer-clean
-	$(MAKE) -C lwgeom maintainer-clean
+	$(MAKE) -C postgis maintainer-clean
 	$(MAKE) -C jdbc2 maintainer-clean
 	$(MAKE) distclean
 	rm -f configure
@@ -42,16 +42,16 @@
 	$(MAKE) -C liblwgeom clean
 
 postgis: liblwgeom
-	$(MAKE) -C lwgeom 
+	$(MAKE) -C postgis 
 
 postgis-clean:
-	$(MAKE) -C lwgeom clean
+	$(MAKE) -C postgis clean
 
 postgis-install:
-	$(MAKE) -C lwgeom install
+	$(MAKE) -C postgis install
 
 postgis-uninstall:
-	$(MAKE) -C lwgeom uninstall
+	$(MAKE) -C postgis uninstall
 
 loaderdumper:
 	$(MAKE) -C loader

Modified: trunk/README.postgis
===================================================================
--- trunk/README.postgis	2009-02-11 18:22:32 UTC (rev 3686)
+++ trunk/README.postgis	2009-02-11 18:28:53 UTC (rev 3687)
@@ -13,7 +13,7 @@
 
   ./            Build scripts and install directions.
   ./liblwgeom   LWGEOM access library.
-  ./lwgeom      PostGIS library source code.
+  ./postgis     PostGIS library source code.
   ./java/ejb    EJB Java support
   ./java/jdbc   Extensions to the PostgreSQL JDBC drivers to support
                 the GIS objects. 
@@ -147,7 +147,7 @@
 So, as postgres run:
 
   createlang plpgsql <yourdatabase>
-  psql -f lwgeom/postgis.sql -d <your_database>
+  psql -f postgis/postgis.sql -d <your_database>
 
 Your database should now be spatially enabled.
 

Modified: trunk/STYLE
===================================================================
--- trunk/STYLE	2009-02-11 18:22:32 UTC (rev 3686)
+++ trunk/STYLE	2009-02-11 18:28:53 UTC (rev 3687)
@@ -42,7 +42,7 @@
 
 :Naming:
 
-For liblwgeom:
+For ./liblwgeom:
 
 - Files should be named with an lw prefix.
 - Functions should have an lw prefix (lw_get_point).
@@ -50,7 +50,7 @@
 - Function names should indicate the geometry type of inputs
   if relevant (lwline_split)
 
-For lwgeom:
+For ./postgis:
 
 - C functions called by the back-end directly (function(PG_FUNCTION_ARGS)) 
   should be named to match their most likely SQL alias. So

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-02-11 18:22:32 UTC (rev 3686)
+++ trunk/configure.ac	2009-02-11 18:28:53 UTC (rev 3687)
@@ -539,5 +539,5 @@
 dnl AC_MSG_RESULT([SHLIB_LINK: $SHLIB_LINK])
 
 dnl Output the relevant files
-AC_OUTPUT([liblwgeom/Makefile liblwgeom/cunit/Makefile lwgeom/Makefile lwgeom/sqldefines.h loader/Makefile topology/Makefile regress/Makefile doc/Makefile])
+AC_OUTPUT([liblwgeom/Makefile liblwgeom/cunit/Makefile postgis/Makefile postgis/sqldefines.h loader/Makefile topology/Makefile regress/Makefile doc/Makefile])
 

Modified: trunk/make_dist.sh
===================================================================
(Binary files differ)

Modified: trunk/regress/Makefile.in
===================================================================
--- trunk/regress/Makefile.in	2009-02-11 18:22:32 UTC (rev 3686)
+++ trunk/regress/Makefile.in	2009-02-11 18:28:53 UTC (rev 3687)
@@ -68,12 +68,12 @@
 
 all: test 
 
-test check: ../lwgeom/liblwgeom.so ../loader/pgsql2shp ../loader/shp2pgsql $(PREPROC)
-	cp ../lwgeom/postgis.sql .
+test check: ../postgis/postgis.so ../loader/pgsql2shp ../loader/shp2pgsql $(PREPROC)
+	cp ../postgis/postgis.sql .
 	@USE_VERSION="$(POSTGIS_PGSQL_VERSION)" ./run_test $(TESTS)
 
-../lwgeom/liblwgeom.so:
-	$(MAKE) -C ../lwgeom
+../postgis/postgis.so:
+	$(MAKE) -C ../postgis
 
 ../loader/pgsql2shp ../loader/shp2pgsql:
 	$(MAKE) -C ../loader

Modified: trunk/topology/topology.sql.in.c
===================================================================
--- trunk/topology/topology.sql.in.c	2009-02-11 18:22:32 UTC (rev 3686)
+++ trunk/topology/topology.sql.in.c	2009-02-11 18:28:53 UTC (rev 3687)
@@ -160,7 +160,7 @@
 --  
 --  
 
-#include "../lwgeom/sqldefines.h"
+#include "../postgis/sqldefines.h"
 
 DROP SCHEMA topology CASCADE;