From 531831309cfa8f9d0d6977961f9a2bea0e18086f Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sat, 5 Mar 2022 21:19:01 +0000
Subject: japanese-otf (5mar22)

git-svn-id: svn://tug.org/texlive/trunk@62455 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/tlpkg/libexec/ctan2tds | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'Master/tlpkg')

diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index ae7019784b8..84215837ff3 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -5665,28 +5665,28 @@ sub MAKEtexsis {
 
 sub MAKEjapaneseotf {
  &setup;
- &xchdir("$DEST/doc/fonts/$package");
+ &xchdir ("$DEST/doc/fonts/$package");
  for my $i (qw/vf tfm ofm ovp/) {
    if (-d $i) {
      &xmkdir ("$DEST/fonts/$i/public/$package");
-     &SYSTEM("$MV $i/* $DEST/fonts/$i/public/$package/; rmdir $i");
+     &SYSTEM ("$MV $i/* $DEST/fonts/$i/public/$package/; rmdir $i");
    }
  }
  if (-d "sty") {
    &xmkdir ("$DEST/tex/platex/$package");
-   &SYSTEM("$MV sty/* $DEST/tex/platex/$package/; rmdir sty");
+   &SYSTEM ("$MV sty/* $DEST/tex/platex/$package/; rmdir sty");
  }
  if (-d "TeXLive-maps") {
    &xmkdir ("$DEST/fonts/map/dvipdfmx/$package");
-   &SYSTEM("$MV TeXLive-maps/* $DEST/fonts/map/dvipdfmx/$package/; rmdir TeXLive-maps");
+   &SYSTEM ("$MV TeXLive-maps/* $DEST/fonts/map/dvipdfmx/$package/; rmdir TeXLive-maps");
  }
  #
  # remove the fontmap dir as it contains files with parenthesis
  &SYSTEM("$RM -rf fontmap");
  #
  my $dstdir = "$DEST/source/fonts/$package";
- &xmkdir ($dstdir);
- &SYSTEM ("$MV src $dstdir/");
+ &SYSTEM ("rmdir $dstdir");   # no extra src/ level
+ &SYSTEM ("$MV src $dstdir");
 }
 
 sub MAKEieeetran {
-- 
cgit v1.2.3