From 132f956360d721fccf4f3829044f5f6eceac3ffd Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Fri, 17 Jan 2014 13:35:08 +0200 Subject: Quote $(top_srcdir) in test/Makefile.am. --- test/ChangeLog | 4 ++++ test/Makefile.am | 6 +++--- test/Makefile.in | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/test/ChangeLog b/test/ChangeLog index 95f8fe17..1da74f8a 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,7 @@ +2014-01-17 Arnold D. Robbins + + * Makefile.am: Quote instances of $(top_srcdir) also. + 2014-01-16 Andrew J. Schorr * Makefile.am (strftime): Remove comment about the race condition, since diff --git a/test/Makefile.am b/test/Makefile.am index cb9bdc83..8f37d25b 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1800,7 +1800,7 @@ inplace3:: testext:: @echo $@ - @$(AWK) '/^(@load|BEGIN)/,/^}/' $(top_srcdir)/extension/testext.c > testext.awk + @$(AWK) '/^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk @$(AWK) -f testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk @@ -1810,8 +1810,8 @@ readdir: echo If it does, try rerunning on an ext'[234]' filesystem. ; \ fi @echo $@ - @$(AWK) -f "$(srcdir)"/readdir.awk $(top_srcdir) > _$@ - @ls -afli $(top_srcdir) | sed 1d | $(AWK) -f "$(srcdir)"/readdir0.awk -v extout=_$@ $(top_srcdir) > $@.ok + @$(AWK) -f "$(srcdir)"/readdir.awk "$(top_srcdir)" > _$@ + @ls -afli $"(top_srcdir)" | sed 1d | $(AWK) -f "$(srcdir)"/readdir0.awk -v extout=_$@ "$(top_srcdir)" > $@.ok @-$(CMP) $@.ok _$@ && rm -f $@.ok _$@ fts: diff --git a/test/Makefile.in b/test/Makefile.in index fa0f6345..3108723f 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2223,7 +2223,7 @@ inplace3:: testext:: @echo $@ - @$(AWK) '/^(@load|BEGIN)/,/^}/' $(top_srcdir)/extension/testext.c > testext.awk + @$(AWK) '/^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk @$(AWK) -f testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk @@ -2233,8 +2233,8 @@ readdir: echo If it does, try rerunning on an ext'[234]' filesystem. ; \ fi @echo $@ - @$(AWK) -f "$(srcdir)"/readdir.awk $(top_srcdir) > _$@ - @ls -afli $(top_srcdir) | sed 1d | $(AWK) -f "$(srcdir)"/readdir0.awk -v extout=_$@ $(top_srcdir) > $@.ok + @$(AWK) -f "$(srcdir)"/readdir.awk "$(top_srcdir)" > _$@ + @ls -afli $"(top_srcdir)" | sed 1d | $(AWK) -f "$(srcdir)"/readdir0.awk -v extout=_$@ "$(top_srcdir)" > $@.ok @-$(CMP) $@.ok _$@ && rm -f $@.ok _$@ fts: -- cgit v1.2.3 From 5163d771a34406de44889c9e297699d04af13308 Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Fri, 17 Jan 2014 13:40:38 +0200 Subject: Fix typo from last change. --- test/Makefile.am | 2 +- test/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 8f37d25b..5a0c5a63 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1811,7 +1811,7 @@ readdir: fi @echo $@ @$(AWK) -f "$(srcdir)"/readdir.awk "$(top_srcdir)" > _$@ - @ls -afli $"(top_srcdir)" | sed 1d | $(AWK) -f "$(srcdir)"/readdir0.awk -v extout=_$@ "$(top_srcdir)" > $@.ok + @ls -afli "$(top_srcdir)" | sed 1d | $(AWK) -f "$(srcdir)"/readdir0.awk -v extout=_$@ "$(top_srcdir)" > $@.ok @-$(CMP) $@.ok _$@ && rm -f $@.ok _$@ fts: diff --git a/test/Makefile.in b/test/Makefile.in index 3108723f..d0d527f4 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2234,7 +2234,7 @@ readdir: fi @echo $@ @$(AWK) -f "$(srcdir)"/readdir.awk "$(top_srcdir)" > _$@ - @ls -afli $"(top_srcdir)" | sed 1d | $(AWK) -f "$(srcdir)"/readdir0.awk -v extout=_$@ "$(top_srcdir)" > $@.ok + @ls -afli "$(top_srcdir)" | sed 1d | $(AWK) -f "$(srcdir)"/readdir0.awk -v extout=_$@ "$(top_srcdir)" > $@.ok @-$(CMP) $@.ok _$@ && rm -f $@.ok _$@ fts: -- cgit v1.2.3