Stop including drop calls from main postgis.sql file

Upgrade file is still generated with the drop file included

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

diff --git a/postgis/Makefile.in b/postgis/Makefile.in
index 9ded4c5e06a990fdcd1091646ded677c1c52711e..bbda6193daeeba36c4dfb7569ce835a59601ae4f 100644 (file)
--- a/postgis/Makefile.in
+++ b/postgis/Makefile.in
@@ -123,10 +123,9 @@ $(PG_OBJS): ../liblwgeom/.libs/liblwgeom.a ../libpgcommon/libpgcommon.a ../postg
 %.sql: %.sql.in
        sed 's,MODULE_PATHNAME,$$libdir/postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@,g' $< >$@
 
-postgis_upgrade_20_minor.sql.in: postgis_drop_before.sql.in.c postgis.sql
+postgis_upgrade_20_minor.sql.in: postgis_drop_before.sql.in.c postgis.sql postgis_drop.sql.in.c
        cat $^ > $@
-postgis_upgrade_20_minor.sql: ../utils/postgis_proc_upgrade.pl
-postgis_upgrade_20_minor.sql: postgis_upgrade_20_minor.sql.in
+postgis_upgrade_20_minor.sql: postgis_upgrade_20_minor.sql.in ../utils/postgis_proc_upgrade.pl 
        $(PERL) ../utils/postgis_proc_upgrade.pl $< 2.0 > $@
 
 # Generate any .sql.in files from .sql.in.c files by running them through the C pre-processor 
@@ -134,7 +133,7 @@ $(SQL_OBJS): %.in: %.in.c
        $(CPP) -traditional-cpp -I../libpgcommon $< | grep -v '^#' > $@
 
 # SQL objects are also dependent on postgis_config.h for PostgreSQL version
-$(SQL_OBJS): ../postgis_config.h
+$(SQL_OBJS): ../postgis_config.h ../postgis_svn_revision.h
 
 postgis.sql.in: sqldefines.h long_xact.sql.in.c geography.sql.in.c postgis_drop.sql.in.c
 

diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index b7ae9af25811b1c07778a5a9cdd60038a6433037..171cc9f98f117a9b6d568df4e96313d6f503e612 100644 (file)
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -4986,5 +4986,3 @@ CREATE OR REPLACE FUNCTION ST_AsX3D(geom geometry, maxdecimaldigits integer DEFA
        LANGUAGE 'sql' IMMUTABLE;
 
 COMMIT;
-
-#include "postgis_drop.sql.in.c"