Commit ddfe100a authored by Paul Ramsey's avatar Paul Ramsey

Change references from ./lwgeom to ./postgis


git-svn-id: http://svn.osgeo.org/postgis/trunk@3687 b70326c6-7e19-0410-871a-916f4a2858ee
parent e4c31abc
......@@ -24,7 +24,7 @@ maintainer-clean:
@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 @@ liblwgeom-clean:
$(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
......
......@@ -13,7 +13,7 @@ Directory structure:
./ 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 @@ manually for some reason.)
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.
......
......@@ -42,7 +42,7 @@ Comments should be written in C style (/* .... */) and not C++ style (//)
: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 @@ For liblwgeom:
- 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
......
......@@ -539,5 +539,5 @@ AC_SUBST([SHLIB_LINK])
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])
......@@ -66,7 +66,7 @@ cd "$owd"
## generating parser
#echo "Generating parser"
#owd="$PWD"
#cd "$outdir"/lwgeom
#cd "$outdir"/postgis
#make lex.yy.c
#if [ $? -gt 0 ]; then
# exit 1
......
......@@ -68,12 +68,12 @@ endif
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
......
......@@ -160,7 +160,7 @@
--
--
#include "../lwgeom/sqldefines.h"
#include "../postgis/sqldefines.h"
DROP SCHEMA topology CASCADE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment