lwpostgis.sql copy moved from root to lwgeom/Makefile

git-svn-id: http://svn.osgeo.org/postgis/trunk@1137 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/Makefile b/Makefile
index 54245fa8f46945d469df512a9a53a595242432e3..b26c464671732354ba72e908240429bb39518054 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,6 @@ clean: liblwgeom-clean loaderdumper-clean
 
 liblwgeom: 
        $(MAKE) -C lwgeom
-       cp lwgeom/lwpostgis.sql lwpostgis.sql
 
 liblwgeom-clean:
        $(MAKE) -C lwgeom clean

diff --git a/lwgeom/Makefile b/lwgeom/Makefile
index ca7f96ae4897d25c9a7198053b80e388ff849954..0b4eff76dcfa17501546535c05972b2d550f6f67 100644 (file)
--- a/lwgeom/Makefile
+++ b/lwgeom/Makefile
@@ -120,6 +120,7 @@ all: $(GEOS_RULES) all-lib lwpostgis.sql
 
 lwpostgis.sql: lwpostgis.sql.in
        cpp -P -traditional-cpp -DUSE_VERSION=$(USE_VERSION) $< | sed -e 's:@MODULE_FILENAME@:$(MODULE_FILENAME):g;s:@POSTGIS_VERSION@:$(POSTGIS_VERSION):g;s:@POSTGIS_SCRIPTS_VERSION@:$(SCRIPTS_VERSION):g' | grep -v ^# > $@
+       cp lwpostgis.sql ..
 
 install: all installdirs install-lwgeom-lib install-lwgeom-scripts