sql/: Use more portable sed expression to get list of files.

Old expression was not sed 3.x compatible, used in mingw.

diff --git a/sql/londiste/Makefile b/sql/londiste/Makefile
index 6cbc27dd29c151d8a22dc479c885c2d557ac5673..e07d5a0dfde5d159c9cafb0024b36cb07ee1ed7c 100644 (file)
--- a/sql/londiste/Makefile
+++ b/sql/londiste/Makefile
@@ -2,7 +2,7 @@
 DATA_built = londiste.sql londiste.upgrade.sql
 
 SQLS = structure/tables.sql structure/grants.sql structure/functions.sql
-FUNCS = $(shell sed -n -e '/^\\/{s/\\i //;p}' $(SQLS))
+FUNCS = $(shell sed -e 's/^[^\\].*//' -e 's/\\i //' $(SQLS))
 SRCS = $(SQLS) $(FUNCS)
 
 REGRESS = londiste_install londiste_provider londiste_subscriber \

diff --git a/sql/pgq/Makefile b/sql/pgq/Makefile
index 37facee40be1cebfcebd4f9e28857ed2a36337cf..dbeb250024e76249a3cfcb52978860985d05e5d7 100644 (file)
--- a/sql/pgq/Makefile
+++ b/sql/pgq/Makefile
@@ -5,7 +5,7 @@ DATA = structure/uninstall_pgq.sql
 
 # scripts that load other sql files
 LDRS = structure/func_internal.sql structure/func_public.sql structure/triggers.sql
-FUNCS = $(shell sed -n -e '/^\\/{s/\\i //;p}' $(LDRS))
+FUNCS = $(shell sed -e 's/^[^\\].*//' -e 's/\\i //' $(LDRS))
 SRCS = structure/tables.sql structure/grants.sql structure/install.sql \
        structure/uninstall_pgq.sql $(FUNCS)
 

diff --git a/sql/pgq_node/Makefile b/sql/pgq_node/Makefile
index 46bbd55a3602add03a4c425a777db8e524380bc5..7c2d3055c8a000af09d49e1696417c4937be896d 100644 (file)
--- a/sql/pgq_node/Makefile
+++ b/sql/pgq_node/Makefile
@@ -1,7 +1,8 @@
 
 DATA_built = pgq_node.sql pgq_node.upgrade.sql
 
-FUNCS = $(shell sed -n -e '/^\\/{s/\\i //;p}' structure/functions.sql)
+LDRS = structure/functions.sql
+FUNCS = $(shell sed -e 's/^[^\\].*//' -e 's/\\i //' $(LDRS))
 SRCS = structure/tables.sql structure/functions.sql $(FUNCS)
 
 REGRESS = pgq_node_test