pst-plot runtime restored

git-svn-id: svn://tug.org/texlive/trunk@31430 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 13 insertions, 5 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-plot/tex/pst-plot.tex b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
index 111a92abcaa..111a92abcaa 100644
--- a/Master/texmf-dist/doc/generic/pst-plot/tex/pst-plot.tex
+++ b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
diff --git a/Master/texmf-dist/doc/generic/pst-plot/tex/pst-plot97.tex b/Master/texmf-dist/tex/generic/pst-plot/pst-plot97.tex
index c72ea79624a..c72ea79624a 100644
--- a/Master/texmf-dist/doc/generic/pst-plot/tex/pst-plot97.tex
+++ b/Master/texmf-dist/tex/generic/pst-plot/pst-plot97.tex
diff --git a/Master/texmf-dist/doc/generic/pst-plot/latex/pst-plot.sty b/Master/texmf-dist/tex/latex/pst-plot/pst-plot.sty
index e515363d30d..e515363d30d 100644
--- a/Master/texmf-dist/doc/generic/pst-plot/latex/pst-plot.sty
+++ b/Master/texmf-dist/tex/latex/pst-plot/pst-plot.sty
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 65315ac3f9b..6c5a0764e89 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -4093,7 +4093,6 @@ sub MAKEpstricks {
   &xmkdir ("$DEST/tex/generic");
   &SYSTEM ("$MV generic $DEST/tex/generic/pstricks");
   &SYSTEM ("$MV config $DEST/tex/generic/pstricks/");
-  &SYSTEM ("$RM $DEST/tex/generic/pstricks/test.ps");
   #
   &xmkdir ("$DEST/tex/latex");
   &SYSTEM ("$MV latex $DEST/tex/latex/pstricks");
@@ -4521,10 +4520,19 @@ sub MAKEpst {
    &dotype1;   
    &killfiles ($standardclean);
    &killfiles ($moreclean{$package}, "more") if $moreclean{$package};
-   &SYSTEM("mkdir -p $DEST/tex/latex/$package");
-   &SYSTEM("mv $DEST/tex/generic/$package/*sty $DEST/tex/latex/$package");
-   &SYSTEM("mv $DEST/doc/generic/$package/*cfg $DEST/tex/latex/$package 2>/dev/null")
-     unless $package eq "pst-pad"; # its showexpl.cfg is for the doc
+
+   &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 $postaction = $posthook{$package};
   eval ($postaction) if $postaction;