From 20b3e664c89d9c19b65cf2e05a8665198fe10009 Mon Sep 17 00:00:00 2001 From: Bborie Park Date: Fri, 3 Feb 2012 03:51:26 +0000 Subject: [PATCH] Merge of patch provided in #1533. Thanks gdt. git-svn-id: http://svn.osgeo.org/postgis/trunk@9014 b70326c6-7e19-0410-871a-916f4a2858ee --- raster/rt_pg/Makefile.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/raster/rt_pg/Makefile.in b/raster/rt_pg/Makefile.in index 33cc3467b..d36de6565 100644 --- a/raster/rt_pg/Makefile.in +++ b/raster/rt_pg/Makefile.in @@ -96,9 +96,13 @@ $(SQL_OBJS): %.in: %.in.c $(SQL_OBJS): ../../postgis/sqldefines.h #remove all create object types since these can't be done cleanly in an upgrade + +# Use extended regular expressions, because | is not supported in +# basic regular expressions. +# Use -E, the traditional switch, because it is also supported by GNU sed. 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' \ + sed -E -e '/^(CREATE|ALTER) (CAST|OPERATOR|TYPE|TABLE|SCHEMA|DOMAIN|TRIGGER).*;/d' \ + -e '/^(CREATE|ALTER) (CAST|OPERATOR|TYPE|TABLE|SCHEMA|DOMAIN|TRIGGER)/,/;/d' \ $< > $@ rtpostgis_upgrade_20_minor.sql: rtpostgis_drop.sql rtpostgis_upgrade_cleanup.sql rtpostgis_upgrade.sql -- 2.40.0