From cfaec9444be7e5f846986bb86c0b60d02effb106 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Thu, 1 Mar 2012 08:26:25 +0000 Subject: [PATCH] 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 --- postgis/Makefile.in | 7 +++---- postgis/postgis.sql.in.c | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/postgis/Makefile.in b/postgis/Makefile.in index 9ded4c5e0..bbda6193d 100644 --- 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 b7ae9af25..171cc9f98 100644 --- 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" -- 2.40.0