]> granicus.if.org Git - postgis/commitdiff
Merge of patch provided in #1533. Thanks gdt.
authorBborie Park <bkpark at ucdavis.edu>
Fri, 3 Feb 2012 03:51:26 +0000 (03:51 +0000)
committerBborie Park <bkpark at ucdavis.edu>
Fri, 3 Feb 2012 03:51:26 +0000 (03:51 +0000)
git-svn-id: http://svn.osgeo.org/postgis/trunk@9014 b70326c6-7e19-0410-871a-916f4a2858ee

raster/rt_pg/Makefile.in

index 33cc3467bc7306500ebc17767d014dd126af8bd0..d36de65658d9d28c239f2fbd22e941413b50fcac 100644 (file)
@@ -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