1 files changed, 33 insertions, 30 deletions
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 200c67226e8..2fe1dfe19a6 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -4514,39 +4514,42 @@ sub MAKEbeebe {
 # pstricks packages usually support both plain and latex.
 # 
 sub MAKEpst {
-   print "\t SPECIAL pst $package starts\n";
-   # pst-laboObj.tex and pst-fp.sty need special cases:
-   $standardtex = qq!^(($package(Obj)?)|pst-fp)\.(tex|sty)!;
-   $whichformat='generic';
-   $whichdocformat='generic';
-   $specialsourcefmt{$package}='generic';
-   $specialsource{$package} = "Makefile|$standardsource";  
-   &setup;
-   &xchdir("$DEST/doc/$whichdocformat/$package");
-   &buildfilelist;
+  print "\t SPECIAL pst $package starts\n";
+  # pst-laboObj.tex and pst-fp.sty need special cases:
+  $standardtex = qq!^(($package(Obj)?)|pst-fp)\.(tex|sty)!;
+  $whichformat='generic';
+  $whichdocformat='generic';
+  $specialsourcefmt{$package}='generic';
+  $specialsource{$package} = "Makefile|$standardsource";  
+  &setup;
+  &xchdir("$DEST/doc/$whichdocformat/$package");
+  &buildfilelist;
 
-   $inspatt=$standardins if ! $inspatt;
-   &runins($inspatt);
-   &buildfilelist;
-   &dosource;
-   &dotex;
-   &dotype1;   
-   &killfiles ($standardclean);
-   &killfiles ($moreclean{$package}, "more") if $moreclean{$package};
+  $inspatt=$standardins if ! $inspatt;
+  &runins($inspatt);
+  &buildfilelist;
+  &dosource;
+  &dotex;
+  &dotype1;   
+  &killfiles ($standardclean);
+  &killfiles ($moreclean{$package}, "more") if $moreclean{$package};
 
-   &xmkdir ("$DEST/tex/latex/$package");
-   
-   my @plain = glob ("tex/*");
-   &SYSTEM("$MV @plain $DEST/tex/generic/$package") if @plain;
-   
-   my @sty = glob ("$DEST/tex/generic/$package/*sty");
-   push (@sty, "latex/*");  # in case the source has a subdir
-   &SYSTEM("$MV @sty $DEST/tex/latex/$package") if @sty;
-   
-   my @cfg = glob ("$DEST/doc/generic/$package/*cfg");
-   @cfg = () if $package eq "pst-pad"; # its showexpl.cfg is for the doc
-   &SYSTEM("$MV @cfg $DEST/tex/latex/$package") if @cfg;
+  my @cfg = glob ("$DEST/doc/generic/$package/*cfg");
+  @cfg = () if $package eq "pst-pad"; # its showexpl.cfg is for the doc
+  &mv_with_mkdir (@cfg, "$DEST/tex/latex/$package") if @cfg;
 
+  my @dvips = glob ("dvips/*");
+  &mv_with_mkdir (@dvips, "$DEST/dvips/$package") if @dvips;
+
+  my @plain = glob ("tex/*");
+  &mv_with_mkdir (@plain, "$DEST/tex/generic/$package") if @plain;
+
+  my @sty = glob ("$DEST/tex/generic/$package/*sty");
+  push (@sty, "latex/*");  # in case the source has a subdir
+  &mv_with_mkdir (@sty, "$DEST/tex/latex/$package") if @sty;
+
+  &SYSTEM("$MV doc/* .") if -d "doc";
+  
   my $postaction = $posthook{$package};
   eval ($postaction) if $postaction;
 }