[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] maint: fix distclean-check failure due to THANKS
From: |
Pádraig Brady |
Subject: |
[PATCH] maint: fix distclean-check failure due to THANKS |
Date: |
Fri, 3 Jul 2015 21:35:11 +0100 |
* 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.
---
Makefile.am | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index f5543dd..cc4fde7 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 $@
--
2.4.1
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] maint: fix distclean-check failure due to THANKS,
Pádraig Brady <=