From a0c941e2d9ba16b691acc58aa814f0fcf6d85343 Mon Sep 17 00:00:00 2001 From: Paul Ramsey Date: Mon, 6 Feb 2012 03:20:48 +0000 Subject: [PATCH] Allow 'make check' to run all the way through on OSX (the sed implementation must be slightly different, so let's see if Perl is any more standard). Hopefully other platforms will be happy. git-svn-id: http://svn.osgeo.org/postgis/trunk@9037 b70326c6-7e19-0410-871a-916f4a2858ee --- raster/rt_pg/Makefile.in | 4 +--- topology/Makefile.in | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/raster/rt_pg/Makefile.in b/raster/rt_pg/Makefile.in index 33cc3467b..322aae46c 100644 --- a/raster/rt_pg/Makefile.in +++ b/raster/rt_pg/Makefile.in @@ -97,9 +97,7 @@ $(SQL_OBJS): ../../postgis/sqldefines.h #remove all create object types since these can't be done cleanly in an upgrade rtpostgis_upgrade.sql: rtpostgis.sql - sed -e '/^\(CREATE\|ALTER\) \(CAST\|OPERATOR\|TYPE\|TABLE\|SCHEMA\|DOMAIN\|TRIGGER\).*;/d' \ - -e '/^\(CREATE\|ALTER\) \(CAST\|OPERATOR\|TYPE\|TABLE\|SCHEMA\|DOMAIN\|TRIGGER\)/,/\;/d' \ - $< > $@ + $(PERL) -0777 -ne 's/^(CREATE|ALTER) (CAST|OPERATOR|TYPE|TABLE|SCHEMA|DOMAIN|TRIGGER).*?;//msg;print;' $< > $@ rtpostgis_upgrade_20_minor.sql: rtpostgis_drop.sql rtpostgis_upgrade_cleanup.sql rtpostgis_upgrade.sql cat $^ > $@ diff --git a/topology/Makefile.in b/topology/Makefile.in index d09a69d17..2a114005d 100644 --- a/topology/Makefile.in +++ b/topology/Makefile.in @@ -76,10 +76,8 @@ $(SQL_OBJS): %.in: %.in.c #Generate upgrade script by stripping things that can't be reinstalled #e.g. don't bother with tables, types, triggers, and domains topology_upgrade.sql: topology.sql - sed -e '/^\(CREATE\|ALTER\) \(CAST\|TYPE\|TABLE\|SCHEMA\|DOMAIN\|TRIGGER\).*;/d' \ - -e '/^\(CREATE\|ALTER\) \(CAST\|TYPE\|TABLE\|SCHEMA\|DOMAIN\|TRIGGER\)/,/\;/d' \ - $< > $@ - + $(PERL) -0777 -ne 's/^(CREATE|ALTER) (CAST|OPERATOR|TYPE|TABLE|SCHEMA|DOMAIN|TRIGGER).*?;//msg;print;' $< > $@ + topology_upgrade_20_minor.sql: topology_drop_before.sql topology_upgrade.sql topology_drop_after.sql cat $^ > $@ -- 2.40.0