diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2013-11-28 22:27:47 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2013-11-28 22:27:47 +0200 |
| commit | 44164e59a0398e5ffc2e7f5519c295aad2df6655 (patch) | |
| tree | d2e133f2ee78218010cfdac8b77d3f6504f6d89d | |
| parent | eac9994fe3f765848d7815bb32ece216cd3a7cac (diff) | |
| download | gawk-44164e59a0398e5ffc2e7f5519c295aad2df6655.tar.gz | |
Make 'make distcheck' work.
| -rw-r--r-- | extension/ChangeLog | 5 | ||||
| -rw-r--r-- | extension/Makefile.am | 6 | ||||
| -rw-r--r-- | extension/Makefile.in | 6 | ||||
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/Makefile.in | 2 | ||||
| -rw-r--r-- | test/readdir0.awk | 6 |
7 files changed, 28 insertions, 4 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog index 0293ae99..2f15635e 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,3 +1,8 @@ +2013-11-28 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (uninstall-so, uninstall-recursive): Remove the + .so files. Keeps make distcheck happy. + 2013-11-17 Dmitry V. Levin <ldv@altlinux.org> * Makefile.am (dist_man_MANS): Add inplace.3am. diff --git a/extension/Makefile.am b/extension/Makefile.am index 6ecffabc..3ef72568 100644 --- a/extension/Makefile.am +++ b/extension/Makefile.am @@ -103,6 +103,12 @@ install-data-hook: $(RM) $(pkgextensiondir)/$$i ; \ done +# Keep the uninstall check working: +uninstall-so: + $(RM) $(pkgextensiondir)/*.so + +uninstall-recursive: uninstall-so + EXTRA_DIST = build-aux/config.rpath \ ChangeLog \ ChangeLog.0 \ diff --git a/extension/Makefile.in b/extension/Makefile.in index ee55d65b..bc7d81af 100644 --- a/extension/Makefile.in +++ b/extension/Makefile.in @@ -1195,6 +1195,12 @@ install-data-hook: $(RM) $(pkgextensiondir)/$$i ; \ done +# Keep the uninstall check working: +uninstall-so: + $(RM) $(pkgextensiondir)/*.so + +uninstall-recursive: uninstall-so + # This is an ugly hack, initially for MirBSD but probably needed for other # systems. If gawk doesn't have the API built in, don't try to build the # extensions. diff --git a/test/ChangeLog b/test/ChangeLog index 50f10ad7..ccdeaa0b 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2013-11-28 Arnold D. Robbins <arnold@skeeve.com> + + * readdir0.awk: Take argument which is directory to read. + * Makefile.am (readdir): Pass $(top_srcdir) to readdir0.awk. + 2013-11-27 Andrew J. Schorr <aschorr@telemetry-investments.com> * readdir0.awk: Restore fix so that we do not fail on filesysystems diff --git a/test/Makefile.am b/test/Makefile.am index 892f8657..0562f536 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1812,7 +1812,7 @@ readdir: fi @echo $@ @$(AWK) -f "$(srcdir)"/readdir.awk $(top_srcdir) > _$@ - @ls -afli $(top_srcdir) | sed 1d | $(AWK) -f "$(srcdir)"/readdir0.awk -v extout=_$@ > $@.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 d34a42d2..aa23dc4b 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2207,7 +2207,7 @@ readdir: fi @echo $@ @$(AWK) -f "$(srcdir)"/readdir.awk $(top_srcdir) > _$@ - @ls -afli $(top_srcdir) | sed 1d | $(AWK) -f "$(srcdir)"/readdir0.awk -v extout=_$@ > $@.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/readdir0.awk b/test/readdir0.awk index 5aedbf70..296c03c7 100644 --- a/test/readdir0.awk +++ b/test/readdir0.awk @@ -12,8 +12,10 @@ BEGIN { } BEGIN { - ls_afi = "ls -afi .." - ls_al = "ls -lna .. | sed 1d" + dir = ARGV[1] + delete ARGV[1] + ls_afi = "ls -afi " dir + ls_al = ("ls -lna " dir " | sed 1d") for (i = 1; (ls_afi | getline) > 0; i++) { # inode number is $1, filename is read of record |