maint: pacify ‘make syntax-check’

* THANKS.in: Put J.T. before Jakub again, as apparently
that’s how it’s done in Fedora 36 which is bleeding edge.
* cfg.mk (sc_THANKS_in_sorted): Update for Fedora 36 sort.
(sc_gitignore_missing): The lib files to ignore are now
in lib/.gitignore, not .gitignore.
This commit is contained in:
Paul Eggert committed 2022-07-03 21:11:22 -05:00
1 parent 40dba28572
commit c07b5066b9
2 files changed
+7 -7

No files matched your search

+1 -1
View File
@@ -33,9 +33,9 @@ Francois Pinard pinard@iro.umontreal.ca
Gaumond Pierre gaumondp@ERE.UMontreal.CA
Greg Ubben gsu@romulus.ncsc.mil
Isamu Hasegawa isamu@yamato.ibm.com
J.T. Conklin jtc@gain.com
Jakub Jelinek jakub@redhat.com
Jason Molenda crash@cygnus.com
J.T. Conklin jtc@gain.com
Karl Berry karl@freefriends.org
Karl Heuer kwzh@gnu.org
Kaveh R. Ghazi ghazi@caip.rutgers.edu
+6 -6
View File
@@ -143,10 +143,10 @@ sc_THANKS_in_duplicates:
1>&2; exit 1; } || :
# Ensure the contributor list stays sorted. However, if the system's
# en_US.UTF-8 locale data is erroneous, give a diagnostic and skip
# this test. This affects OS X up to at least 10.11.6.
# en_US.utf8 locale data is erroneous, give a diagnostic and skip
# this test. This affects Ubuntu up to at least 22.04.
sc_THANKS_in_sorted:
@printf '%s\n' ja j.b| LC_ALL=en_US.UTF-8 sort -c 2> /dev/null \
@printf '%s\n' J.T. Jakub | LC_ALL=en_US.utf8 sort -fc 2>/dev/null \
&& { \
sed '/^$$/,/^$$/!d;/^$$/d' $(srcdir)/THANKS.in > $@.1 && \
LC_ALL=en_US.UTF-8 sort -f -k1,1 $@.1 > $@.2 && \
@@ -222,11 +222,11 @@ sc_prohibit-form-feed:
# Ensure gnulib generated files are ignored
# TODO: Perhaps augment gnulib-tool to do this in lib/.gitignore?
sc_gitignore_missing:
@{ sed -n '/^\/lib\/.*\.h$$/{p;p}' $(srcdir)/.gitignore; \
@{ sed -n '/^\/.*\.h$$/{p;p}' $(srcdir)/lib/.gitignore; \
find lib -name '*.in*' ! -name '*~' ! -name 'sys_*' | \
sed 's|^|/|; s|_\(.*in\.h\)|/\1|; s/\.in//'; } | \
sed 's|^lib||; s|_\(.*in\.h\)|/\1|; s/\.in//'; } | \
sort | uniq -u | grep . && { echo '$(ME): Add above' \
'entries to .gitignore' >&2; exit 1; } || :
'entries to lib/.gitignore' >&2; exit 1; } || :
# Similar to the gnulib maint.mk rule for sc_prohibit_strcmp