diff options
author | Mark Wielaard <mark@klomp.org> | 2024-04-28 16:59:39 +0200 |
---|---|---|
committer | Mark Wielaard <mark@klomp.org> | 2024-04-30 09:54:07 +0200 |
commit | ebfd73a80f15559fe59fee32a7844c6b8fa99576 (patch) | |
tree | 0b3cc6655319914082ec3564aa08576b52115669 /Makefile | |
parent | b62928f9070c6f3c5cc43a4cb89b4bfb950d7406 (diff) | |
download | glibc-ebfd73a80f15559fe59fee32a7844c6b8fa99576.tar.gz glibc-ebfd73a80f15559fe59fee32a7844c6b8fa99576.tar.xz glibc-ebfd73a80f15559fe59fee32a7844c6b8fa99576.zip |
Make sure INSTALL is ASCII plaintext again
This reverts commit 84e93afc7 ("Switch to UTF-8 for INSTALL") and reinstates commit c14f2e4aa ("Make sure INSTALL is ASCII plaintext") and regenerates INSTALL. It turns out that different versions of makeinfo (texinfo/texi2any), at least versions 7.0.3 and 7.1, put unicode quote glyphs in different places (specifically whether contractions like you'd, don't, aren't or you'll use ’ or '). This breaks the make dist target as used for (snapshot) releases, which have a check on the regenerated INSTALL file. Using --disable-encoding generates the same plaintext ASCII on all versions. An alternative would be to regenerate INSTALL with texinfo 7.1 and require at least that version. But that seems too soon while various distros don't have 7.1 yet. We can try again to use UTF-8 for INSTALL in a couple of years. Reviewed-by: Florian Weimer <fweimer@redhat.com>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile index 7052b46df8..b5ef98fb04 100644 --- a/Makefile +++ b/Makefile @@ -737,7 +737,7 @@ endif INSTALL: manual/install-plain.texi manual/macros.texi \ $(common-objpfx)manual/pkgvers.texi manual/install.texi makeinfo --no-validate --plaintext --no-number-sections \ - -I$(common-objpfx)manual $< -o $@-tmp + --disable-encoding -I$(common-objpfx)manual $< -o $@-tmp $(AWK) 'NF == 0 { ++n; next } \ NF != 0 { while (n-- > 0) print ""; n = 0; print }' \ < $@-tmp > $@-tmp2 |