summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-03-07 23:56:20 +0000
committerKarl Berry <karl@freefriends.org>2020-03-07 23:56:20 +0000
commit8773bfcf2afca7bebde07bff5bbfb173231bb6ea (patch)
tree7f8e34d77ef3cd2da4e53266e7f5901749b2278c /Build
parent7a201df902af46299e1be728b291fda8ccc3cdd9 (diff)
echo '\f' is not portable, use printf
git-svn-id: svn://tug.org/texlive/trunk@54168 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/utils/xindy/ChangeLog7
-rw-r--r--Build/source/utils/xindy/TLpatches/patch-03-echo-f22
-rw-r--r--Build/source/utils/xindy/xindy-src/make-rules/alphabets/Makefile.am4
-rw-r--r--Build/source/utils/xindy/xindy-src/make-rules/alphabets/Makefile.in3
4 files changed, 34 insertions, 2 deletions
diff --git a/Build/source/utils/xindy/ChangeLog b/Build/source/utils/xindy/ChangeLog
index 4dde81c7be5..f63b2db255c 100644
--- a/Build/source/utils/xindy/ChangeLog
+++ b/Build/source/utils/xindy/ChangeLog
@@ -1,3 +1,10 @@
+2020-03-08 Karl Berry <karl@tug.org>
+
+ * xindy-src/make-rules/alphabets/Makefile.am (alphabets-inc.tex):
+ echo '\f' is not portable; with zsh, dash, others, it outputs
+ a form feed. Use printf instead. Report from jfbu,
+ https://tug.org/pipermail/tex-live/2020-March/044966.html
+
2019-02-10 Karl Berry <karl@tug.org>
* ac/withenable.ac (KPSE_ENABLE_PROG): just disable,
diff --git a/Build/source/utils/xindy/TLpatches/patch-03-echo-f b/Build/source/utils/xindy/TLpatches/patch-03-echo-f
new file mode 100644
index 00000000000..b0a207027ba
--- /dev/null
+++ b/Build/source/utils/xindy/TLpatches/patch-03-echo-f
@@ -0,0 +1,22 @@
+ https://tug.org/pipermail/tex-live/2020-March/044966.html
+
+--- xindy-src/make-rules/alphabets/Makefile.am (revision 54151)
++++ xindy-src/make-rules/alphabets/Makefile.am (working copy)
+@@ -2,6 +2,7 @@
+ ## autoconf/automake files.
+ ## Or, call `automake Makefile' to create only Makefile.in.
+
++## Copyright 2020 by Karl Berry <tex-live@tug.org>
+ ## Copyright (C) 2004-2005 by Gour.
+ ##
+ ## This program is free software; you can redistribute it and/or
+@@ -274,7 +275,8 @@ alphabets-inc.tex : $(DOCS)
+ echo '\section{Codepage latin9}' >>$@
+ for i in $(DOCS_LATIN9); do echo "\\input{$$i}" >>$@; done
+ echo '\ienc{cp1251}' >>$@
+- echo '\fenc{T2A}' >>$@
++# zsh, dash, others make echo '\f' output a form feed. Sigh.
++ printf '\%s{T2A}\n' "fenc" >>$@
+ echo '\chapter{Cyrillic scripts}' >>$@
+ echo '\section{Codepage 1251}' >>$@
+ for i in $(DOCS_CYR_1251); do echo "\\input{$$i}" >>$@; done
diff --git a/Build/source/utils/xindy/xindy-src/make-rules/alphabets/Makefile.am b/Build/source/utils/xindy/xindy-src/make-rules/alphabets/Makefile.am
index ca8baaa0f26..63060b28839 100644
--- a/Build/source/utils/xindy/xindy-src/make-rules/alphabets/Makefile.am
+++ b/Build/source/utils/xindy/xindy-src/make-rules/alphabets/Makefile.am
@@ -2,6 +2,7 @@
## autoconf/automake files.
## Or, call `automake Makefile' to create only Makefile.in.
+## Copyright 2020 by Karl Berry <tex-live@tug.org>
## Copyright (C) 2004-2005 by Gour.
##
## This program is free software; you can redistribute it and/or
@@ -274,7 +275,8 @@ alphabets-inc.tex : $(DOCS)
echo '\section{Codepage latin9}' >>$@
for i in $(DOCS_LATIN9); do echo "\\input{$$i}" >>$@; done
echo '\ienc{cp1251}' >>$@
- echo '\fenc{T2A}' >>$@
+# zsh, dash, others make echo '\f' output a form feed. Sigh.
+ printf '\%s{T2A}\n' "fenc" >>$@
echo '\chapter{Cyrillic scripts}' >>$@
echo '\section{Codepage 1251}' >>$@
for i in $(DOCS_CYR_1251); do echo "\\input{$$i}" >>$@; done
diff --git a/Build/source/utils/xindy/xindy-src/make-rules/alphabets/Makefile.in b/Build/source/utils/xindy/xindy-src/make-rules/alphabets/Makefile.in
index beb532c45b5..cd967ff6bd2 100644
--- a/Build/source/utils/xindy/xindy-src/make-rules/alphabets/Makefile.in
+++ b/Build/source/utils/xindy/xindy-src/make-rules/alphabets/Makefile.in
@@ -1043,7 +1043,8 @@ alphabets-inc.tex : $(DOCS)
echo '\section{Codepage latin9}' >>$@
for i in $(DOCS_LATIN9); do echo "\\input{$$i}" >>$@; done
echo '\ienc{cp1251}' >>$@
- echo '\fenc{T2A}' >>$@
+# zsh, dash, others make echo '\f' output a form feed. Sigh.
+ printf '\%s{T2A}\n' "fenc" >>$@
echo '\chapter{Cyrillic scripts}' >>$@
echo '\section{Codepage 1251}' >>$@
for i in $(DOCS_CYR_1251); do echo "\\input{$$i}" >>$@; done