diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-05 17:18:59 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-06 00:18:30 -0800 |
| commit | 3471e27de87bb81abd6aa67f4391d3fce9a35437 (patch) | |
| tree | 87d314ef7becbf7b36a2e85823832a86e04b6a1d /Makefile.am | |
| parent | 1893f090c52730d289dbcf00cd34664abe1881ce (diff) | |
| download | gzip-3471e27de87bb81abd6aa67f4391d3fce9a35437.tar.gz | |
gzip: remove --__bindir
* NEWS: Document this.
* gzexe.in, gunzip.in, zcat.in, zcmp.in, zdiff.in, zegrep.in:
* zfgrep.in, zforce.in, zgrep.in, zless.in, zmore.in, znew.in:
Remove support for undocumented --__bindir option. Callers can
set PATH instead; that's less error-prone. This fixes some
'make check' failures on my Solaris 11 box, which occurred
because the test scripts were mistakenly testing the installed
gzip rather than the gzip in the working directory.
* Makefile.am (.in): Don't replace bindir.
(check-local): Set PATH instead of using --__bindir.
* tests/help-version (gunzip_setuphelp, gzexe_setuphelp)
(zcat_setuphelp, zcmp_setuphelp, zdiff_setuphelp)
(zegrep_setuphelp, zfgrep_setuphelp, zforce_setuphelp)
(zgrep_setuphelp, zless_setuphelp, zmore_setuphelp)
(znew_setuphelp): Remove. All uses removed.
(lbracket_setup): Default args to empty.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index b01ddee..8fb17b9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -82,7 +82,6 @@ SUFFIXES = .in .in: $(AM_V_GEN)sed \ -e 's|/bin/sh|$(SHELL)|g' \ - -e 's|[@]bindir@|'\''$(bindir)'\''|g' \ -e 's|[@]GREP@|$(GREP)|g' \ -e 's|[@]VERSION@|$(VERSION)|g' \ $(srcdir)/$@.in >$@-t \ @@ -108,17 +107,18 @@ gen-ChangeLog: FILES_TO_CHECK = $(bin_SCRIPTS) \ $(top_srcdir)/ChangeLog $(top_srcdir)/configure $(top_srcdir)/gzip.c check-local: $(FILES_TO_CHECK) $(bin_PROGRAMS) gzip.doc.gz - $(AM_V_GEN){ test '$(srcdir)' != . \ - || ./zdiff --__bindir . -c gzip.doc.gz; } - $(AM_V_at)./zdiff --__bindir . -c $(srcdir)/gzip.doc $(srcdir)/gzip.doc - $(AM_V_at)./zdiff --__bindir . $(srcdir)/gzip.doc gzip.doc.gz - $(AM_V_at)./zdiff --__bindir . -c - $(srcdir)/gzip.doc <gzip.doc.gz - $(AM_V_at)./zdiff --__bindir . -c gzip.doc.gz gzip.doc.gz - $(AM_V_at)./zgrep --__bindir . -iV >/dev/null - $(AM_V_at)for opt in --rsyncable '' -1 -9; do \ + $(AM_V_GEN)PATH=.:$$PATH; { test '$(srcdir)' != . \ + || zdiff -c gzip.doc.gz; } + $(AM_V_at)PATH=.:$$PATH; zdiff -c $(srcdir)/gzip.doc $(srcdir)/gzip.doc + $(AM_V_at)PATH=.:$$PATH; zdiff $(srcdir)/gzip.doc gzip.doc.gz + $(AM_V_at)PATH=.:$$PATH; zdiff -c - $(srcdir)/gzip.doc <gzip.doc.gz + $(AM_V_at)PATH=.:$$PATH; zdiff -c gzip.doc.gz gzip.doc.gz + $(AM_V_at)PATH=.:$$PATH; zgrep -iV >/dev/null + $(AM_V_at)PATH=.:$$PATH; \ + for opt in --rsyncable '' -1 -9; do \ for file in $(FILES_TO_CHECK); do \ - ./gzip $$opt -c -- "$$file" \ - | ./gzip -d | cmp - "$$file" || exit 1; \ + gzip $$opt -c -- "$$file" \ + | gzip -d | cmp - "$$file" || exit 1; \ done; \ done |