texlive[59870] trunk: syntax, darwin mem files

[commits+karl at tug.org]

Revision: 59870
          http://tug.org/svn/texlive?view=revision&revision=59870
Author:   karl
Date:     2021-07-07 23:30:11 +0200 (Wed, 07 Jul 2021)
Log Message:
-----------
syntax, darwin mem files

Modified Paths:
--------------
    trunk/Build/source/utils/xindy/xindy-src/user-commands/xindy.in
    trunk/Master/texmf-dist/scripts/xindy/xindy.pl
    trunk/Master/tlpkg/tlpsrc/xindy.tlpsrc

Modified: trunk/Build/source/utils/xindy/xindy-src/user-commands/xindy.in
===================================================================
--- trunk/Build/source/utils/xindy/xindy-src/user-commands/xindy.in	2021-07-07 21:01:52 UTC (rev 59869)
+++ trunk/Build/source/utils/xindy/xindy-src/user-commands/xindy.in	2021-07-07 21:30:11 UTC (rev 59870)
@@ -511,9 +511,9 @@
     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";

Modified: trunk/Master/texmf-dist/scripts/xindy/xindy.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/xindy/xindy.pl	2021-07-07 21:01:52 UTC (rev 59869)
+++ trunk/Master/texmf-dist/scripts/xindy/xindy.pl	2021-07-07 21:30:11 UTC (rev 59870)
@@ -511,9 +511,9 @@
     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";

Modified: trunk/Master/tlpkg/tlpsrc/xindy.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/xindy.tlpsrc	2021-07-07 21:01:52 UTC (rev 59869)
+++ trunk/Master/tlpkg/tlpsrc/xindy.tlpsrc	2021-07-07 21:30:11 UTC (rev 59870)
@@ -10,8 +10,11 @@
 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} \
   bin/${ARCH}/xindy.run