Merge with master.

Author: Alexander Korotkov

Makefile

@@ -2,20 +2,23 @@ MODULE_big = pg_sphere
 OBJS       = sscan.o sparse.o sbuffer.o vector3d.o point.o \
              euler.o circle.o line.o ellipse.o polygon.o \
              path.o box.o output.o gq_cache.o gist.o key.o \
-             crossmatch.o
+             crossmatch.o gnomo.o
 
 EXTENSION   = pg_sphere
 DATA_built  = pg_sphere--1.0.sql
 DOCS        = README.pg_sphere COPYRIGHT.pg_sphere
-REGRESS     = init tables points euler circle line ellipse poly path box index
+REGRESS     = init tables points euler circle line ellipse poly path box index \
+              contains_ops contains_ops_compat bounding_box_gist gnomo
+
 EXTRA_CLEAN = pg_sphere--1.0.sql $(PGS_SQL) 
 
 CRUSH_TESTS  = init_extended circle_extended 
 
 # order of sql files is important
 PGS_SQL    =  pgs_types.sql pgs_point.sql pgs_euler.sql pgs_circle.sql \
    pgs_line.sql pgs_ellipse.sql pgs_polygon.sql pgs_path.sql \
-   pgs_box.sql pgs_gist.sql pgs_crossmatch.sql
+   pgs_box.sql pgs_contains_ops.sql pgs_contains_ops_compat.sql \
+   pgs_gist.sql pgs_crossmatch.sql gnomo.sql \
 
 ifdef USE_PGXS
   ifndef PG_CONFIG
@@ -56,4 +59,3 @@ endif
 dist : clean sparse.c sscan.c
 	find . -name '*~' -type f -exec rm {} \;
 	cd .. && tar  --exclude CVS -czf pg_sphere.tar.gz pg_sphere && cd -
- 	

README.pg_sphere

@@ -1,36 +1,31 @@
-This is R-Tree implementation using GiST for spherical objects
-like spherical points and spherical circles with
+This is an R-Tree implementation using GiST for spherical objects
+like spherical points and spherical circles with 
 useful functions and operators.
 
 
 NOTICE:
-     This version will works only with postgresql version 8.0 and above.
+     This version will work only with postgresql version 9.1 and above.
 
-INSTALLATION AS EXTENSION (RECOMMENDED):
+INSTALLATION:
 
   -- build and install
   gmake USE_PGXS=1 PG_CONFIG=/usr/bin/pg_config
   gmake USE_PGXS=1 PG_CONFIG=/usr/bin/pg_config install
   -- load extension
-  psql <database> -c "CREATE EXTENSION pg_sphere;"
+  psql -c "CREATE EXTENSION pg_sphere;" <database>
 
-INSTALLATION AS MODULE (DEPRECATED):
+REGRESSION TEST (as the same user as the currently running postgresql server):
 
-  -- build and install
-  gmake
-  gmake install
-  -- load functions
-  psql <database> < pg_sphere.sql
-
-REGRESSION TEST:
-
-   gmake installcheck
+  make USE_PGXS=1 installcheck
 
 LONG REGRESSION TEST:
 
-   gmake crushtest
+  make USE_PGXS=1 crushtest
+
+The 'make' program must be compatible with GNU make.
 
-For more informations have a look at http://pgsphere.projects.postgresql.org/
+For more information, have a look at http://pgsphere.projects.postgresql.org
+and https://github.com/akorotkov/pgsphere
 
 Have a lot of fun!