diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2022-07-03 21:11:07 -0500 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2022-07-03 21:11:22 -0500 |
| commit | c07b5066b9111c36a97403d6ea5da9bd4c0626fe (patch) | |
| tree | 66f1a5dbf9fdd8444a100023694c253c87ee78cd | |
| parent | 40dba285721e4a83482615e40c1d7521275ccab7 (diff) | |
| download | sed-c07b5066b9111c36a97403d6ea5da9bd4c0626fe.tar.gz | |
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.
| -rw-r--r-- | THANKS.in | 2 | ||||
| -rw-r--r-- | cfg.mk | 12 |
2 files changed, 7 insertions, 7 deletions
@@ -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 @@ -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 |