diff options
| -rw-r--r-- | awklib/ChangeLog | 5 | ||||
| -rw-r--r-- | awklib/Makefile.am | 2 | ||||
| -rw-r--r-- | awklib/Makefile.in | 2 | ||||
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 4 | ||||
| -rw-r--r-- | test/Makefile.in | 4 |
6 files changed, 16 insertions, 6 deletions
diff --git a/awklib/ChangeLog b/awklib/ChangeLog index 6ef0bbde..13d6b090 100644 --- a/awklib/ChangeLog +++ b/awklib/ChangeLog @@ -1,3 +1,8 @@ +2014-10-17 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * Makefile.am (stamp-eg): Use explicit ./extract.awk to avoid + assumptions about AWKPATH in the environment. + 2014-04-08 Arnold D. Robbins <arnold@skeeve.com> * 4.1.1: Release tar ball made. diff --git a/awklib/Makefile.am b/awklib/Makefile.am index 6ffbea81..82b7e07f 100644 --- a/awklib/Makefile.am +++ b/awklib/Makefile.am @@ -68,7 +68,7 @@ $(srcdir)/stamp-eg: $(srcdir)/../doc/gawk.texi $(srcdir)/../doc/gawkinet.texi cd $(srcdir) && \ rm -fr eg && \ rm -fr stamp-eg && \ - $(AWKPROG) -f extract.awk ../doc/gawk.texi ../doc/gawkinet.texi + $(AWKPROG) -f ./extract.awk ../doc/gawk.texi ../doc/gawkinet.texi @echo 'some makes are stupid and will not check a directory' > $(srcdir)/stamp-eg @echo 'against a file, so this file is a place holder. gack.' >> $(srcdir)/stamp-eg diff --git a/awklib/Makefile.in b/awklib/Makefile.in index d32ae04a..4c9a0552 100644 --- a/awklib/Makefile.in +++ b/awklib/Makefile.in @@ -721,7 +721,7 @@ $(srcdir)/stamp-eg: $(srcdir)/../doc/gawk.texi $(srcdir)/../doc/gawkinet.texi cd $(srcdir) && \ rm -fr eg && \ rm -fr stamp-eg && \ - $(AWKPROG) -f extract.awk ../doc/gawk.texi ../doc/gawkinet.texi + $(AWKPROG) -f ./extract.awk ../doc/gawk.texi ../doc/gawkinet.texi @echo 'some makes are stupid and will not check a directory' > $(srcdir)/stamp-eg @echo 'against a file, so this file is a place holder. gack.' >> $(srcdir)/stamp-eg diff --git a/test/ChangeLog b/test/ChangeLog index 4868f374..f85de800 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2014-10-17 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * Makefile.am (profile1, testext): Use explicit ./foo.awk to avoid + assumptions about AWKPATH in the environment. + 2014-10-12 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (charset-msg-start): Add a list of needed locales. diff --git a/test/Makefile.am b/test/Makefile.am index 9b3ede51..f0965d77 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1670,7 +1670,7 @@ dumpvars:: profile1: @echo $@ @$(AWK) --pretty-print=ap-$@.out -f "$(srcdir)"/xref.awk "$(srcdir)"/dtdgport.awk > _$@.out1 - @$(AWK) -f ap-$@.out "$(srcdir)"/dtdgport.awk > _$@.out2 ; rm ap-$@.out + @$(AWK) -f ./ap-$@.out "$(srcdir)"/dtdgport.awk > _$@.out2 ; rm ap-$@.out @$(CMP) _$@.out1 _$@.out2 && rm _$@.out[12] || { echo EXIT CODE: $$? >>_$@ ; \ cp "$(srcdir)"/dtdgport.awk > $@.ok ; } @@ -1861,7 +1861,7 @@ inplace3:: testext:: @echo $@ @$(AWK) '/^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk - @$(AWK) -f testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk readdir: diff --git a/test/Makefile.in b/test/Makefile.in index 2b8a4a16..3df34522 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2095,7 +2095,7 @@ dumpvars:: profile1: @echo $@ @$(AWK) --pretty-print=ap-$@.out -f "$(srcdir)"/xref.awk "$(srcdir)"/dtdgport.awk > _$@.out1 - @$(AWK) -f ap-$@.out "$(srcdir)"/dtdgport.awk > _$@.out2 ; rm ap-$@.out + @$(AWK) -f ./ap-$@.out "$(srcdir)"/dtdgport.awk > _$@.out2 ; rm ap-$@.out @$(CMP) _$@.out1 _$@.out2 && rm _$@.out[12] || { echo EXIT CODE: $$? >>_$@ ; \ cp "$(srcdir)"/dtdgport.awk > $@.ok ; } @@ -2285,7 +2285,7 @@ inplace3:: testext:: @echo $@ @$(AWK) '/^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk - @$(AWK) -f testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk readdir: |