diff options
| author | Pádraig Brady <P@draigBrady.com> | 2015-07-03 19:32:13 +0100 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2015-07-03 21:08:26 +0100 |
| commit | 9a81dd803c8f3c0d04a758a5ad9e16c9b3ba4c63 (patch) | |
| tree | 95c63abfc29bb0086cfc9229df2462d333ca500c /Makefile.am | |
| parent | db3f9596ff9c1a8986f9d308969f8a265e3d7344 (diff) | |
| download | coreutils-9a81dd803c8f3c0d04a758a5ad9e16c9b3ba4c63.tar.xz | |
maint: fix distclean-check failure due to THANKS
* Makefile.am: Remove our dependence on src/sort which
induces awkward dependencies for `make dist` since
THANKS will be rebuilt once src/sort is newer.
Instead we remove the problematic -f option to sort
which actually doesn't change the order given
our current input.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index f5543ddb9..cc4fde7aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -163,7 +163,10 @@ prologue = perl -ne '/^\#\#/ and exit; print' $(srcdir)/THANKS.in # $ test 'abácad' = "$(printf '%s\n' 'ab' 'ác' 'ad' \ # | LC_ALL=en_US.UTF-8 sort -f \ # | tr -d '\n')" && echo GOOD || echo BAD -THANKS: THANKS.in Makefile.am .mailmap thanks-gen .version src/sort +# Note we don't enable case folding (-f) in the sort below, due to bugs +# in the I18N patch used in many distros (as of 2015). Also using our +# own src/sort here would induce awkward dependencies for `make dist`. +THANKS: THANKS.in Makefile.am .mailmap thanks-gen .version $(AM_V_GEN)rm -f $@-t $@; \ { \ $(prologue); echo; \ @@ -172,7 +175,7 @@ THANKS: THANKS.in Makefile.am .mailmap thanks-gen .version src/sort git log --pretty=format:'%aN%x00%aE' \ | $(ASSORT) -u; \ } | $(srcdir)/thanks-gen \ - | LC_ALL=en_US.UTF-8 src/sort -f -k1,1; \ + | LC_ALL=en_US.UTF-8 sort -k1,1; \ echo; \ printf ';; %s\n' 'Local Variables:' 'coding: utf-8' End:; \ } > $@-t && chmod a-w $@-t && mv $@-t $@ |