1 files changed, 28 insertions, 39 deletions
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index b12a2d20c97..ec19b0516c3 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -2781,46 +2781,35 @@ sub MAKEseminar {
 }
 
 sub MAKExypic {
-# this simply copies source files as per INSTALL instructions
-   chdir($packagedir) || die ("ERROR: cannot open directory");
-  &runjob("mkdir -p $DEST/fonts/source/$Foundry/xypic");
-  &runjob("mkdir -p $DEST/fonts/type1/$Foundry/xypic");
-  &runjob("mkdir -p $DEST/fonts/tfm/$Foundry/xypic");
-  &runjob("mkdir -p $DEST/fonts/pk/cx/$Foundry/xypic");
-  &runjob("mkdir -p $DEST/tex/generic/xypic");
-  &runjob("mkdir -p $DEST/dvips/xypic");
-  &runjob("mkdir -p $DEST/doc/generic/xypic");
-  &runjob("mkdir -p $DEST/source/generic/xypic");
-  &runjob("$CP texinputs/* $DEST/tex/generic/xypic");
-  &runjob("$CP texfonts/* $DEST/fonts/tfm/$Foundry/xypic");
-  &runjob("$CP mfinputs/* $DEST/fonts/source/$Foundry/xypic");
-  &runjob("$CP src/* $DEST/doc/generic/xypic");
-  &runjob("$CP type1/* $DEST/fonts/type1/$Foundry/xypic");
-  &runjob("$CP ps/* $DEST/dvips/xypic");
-  &runjob("$CP doc/*.* $DEST/doc/generic/xypic");
-  &runjob("$CP [A-Z]* $DEST/doc/generic/xypic");
-  open (TMP,">$DEST/texmf-dist/dvips/xypic/config.xyp");
+  # Copy source files as per INSTALL instructions.
+  &xchdir ($packagedir);
+  &SYSTEM ("mkdir -p $DEST/doc/generic/xypic");
+  &SYSTEM ("$CP [A-Z]* $DEST/doc/generic/xypic/");
+  &SYSTEM ("$CP doc/*.* $DEST/doc/generic/xypic");
+  &SYSTEM ("$CP support/ $DEST/doc/generic/xypic");  # copy dir as dir
+  #
+  &SYSTEM ("mkdir -p $DEST/tex/generic/xypic");
+  &SYSTEM ("$CP texinputs/* $DEST/tex/generic/xypic/");
+  #
+  &SYSTEM ("mkdir -p $DEST/fonts/tfm/$Foundry/xypic");
+  &SYSTEM ("$CP texfonts/* $DEST/fonts/tfm/$Foundry/xypic/");
+  #
+  &SYSTEM ("mkdir -p $DEST/fonts/afm/$Foundry/xypic");
+  &SYSTEM ("$CP texfonts/* $DEST/fonts/afm/$Foundry/xypic/");
+  #
+  &SYSTEM ("mkdir -p $DEST/fonts/source/$Foundry/xypic");
+  &SYSTEM ("$CP mfinputs/* $DEST/fonts/source/$Foundry/xypic/");
+  #
+  &SYSTEM ("mkdir -p $DEST/fonts/type1/$Foundry/xypic");
+  &SYSTEM ("$CP type1/* $DEST/fonts/type1/$Foundry/xypic/");
+  &SYSTEM ("$CP pfm/* $DEST/fonts/type1/$Foundry/xypic/");
+  #
+  &SYSTEM ("mkdir -p $DEST/dvips/xypic");
+  &SYSTEM ("$CP ps/* $DEST/dvips/xypic/");
+  #
+  open  (TMP,">$DEST/texmf-dist/dvips/xypic/config.xyp");
   print TMP "p +xypic.map";
-  close(TMP);
-# do the PK files
-  chdir("pkfonts");
-  &buildfilelist;  
-  for (@filenames) { 
-    if (-d $_) {
-        chdir $_;
-        s/cx([0-9]*)//;
-        $dpi=$1;
- opendir(DIR,'.');
- @ffontnames =grep(!/^\.\.?$/,readdir(DIR));
- closedir(DIR);
-        for (@ffontnames) { 
-($FileBase,$Filepath,$Filesuffix) = fileparse($_,"\.[A-z0-9]*");
-        &SYSTEM("mkdir -p $DEST/fonts/pk/cx/$Foundry/xypic/dpi$dpi");
-        &SYSTEM("$MV $_ $DEST/fonts/pk/cx/$Foundry/xypic/dpi$dpi/$FileBase.pk");
-               }
-       chdir '..';
-           }
-    }
+  close (TMP);
 }