diff options
author | Karl Berry <karl@freefriends.org> | 2021-07-07 21:30:11 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-07-07 21:30:11 +0000 |
commit | 272b0260c882cb8f044c7b7e95062385f6f88298 (patch) | |
tree | 5d182f8c59f8883d856dcac71f3affb5f1ec9dd3 /Master | |
parent | c39527db5c6c7ee347eaef341385264ca1dd483b (diff) |
syntax, darwin mem files
git-svn-id: svn://tug.org/texlive/trunk@59870 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-x | Master/texmf-dist/scripts/xindy/xindy.pl | 4 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/xindy.tlpsrc | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Master/texmf-dist/scripts/xindy/xindy.pl b/Master/texmf-dist/scripts/xindy/xindy.pl index 2eafd3b1783..909b6c5625d 100755 --- a/Master/texmf-dist/scripts/xindy/xindy.pl +++ b/Master/texmf-dist/scripts/xindy/xindy.pl @@ -511,9 +511,9 @@ if ( $OSNAME eq 'darwin' && ! -e $mem_file ) { my @uname = POSIX::uname(); if ( $uname[4] eq 'Power Macintosh' ) { $mem_file = "$lib_dir/xindy-ppc.mem"; - } else if ( $uname[4] eq 'x86_64' ) { + } elsif ( $uname[4] eq 'x86_64' ) { $mem_file = "$lib_dir/xindy-x86_64.mem"; - } else if ( $uname[4] eq 'arm64' ) { + } elsif ( $uname[4] eq 'arm64' ) { $mem_file = "$lib_dir/xindy-arm64.mem"; } else { $mem_file = "$lib_dir/xindy-i386.mem"; diff --git a/Master/tlpkg/tlpsrc/xindy.tlpsrc b/Master/tlpkg/tlpsrc/xindy.tlpsrc index 98daafc9b49..d3e76bf91cd 100644 --- a/Master/tlpkg/tlpsrc/xindy.tlpsrc +++ b/Master/tlpkg/tlpsrc/xindy.tlpsrc @@ -10,7 +10,10 @@ tlpsetvar no_xindy_platforms \ binpattern f/!${no_xindy_platforms} bin/${ARCH}/texindy binpattern f/!${no_xindy_platforms} bin/${ARCH}/tex2xindy binpattern f/!${no_xindy_platforms} bin/${ARCH}/xindy -binpattern f/!${no_xindy_platforms} bin/${ARCH}/xindy.mem +binpattern f/!universal-darwin,${no_xindy_platforms} bin/${ARCH}/xindy.mem +# +binpattern f/universal-darwin bin/universal-darwin/xindy-arm64.mem +binpattern f/universal-darwin bin/universal-darwin/xindy-x86_64.mem # # cygwin and windows must use a different name for the clisp executable. binpattern f/!i386-cygwin,x86_64-cygwin,win32,${no_xindy_platforms} \ |