diff options
-rwxr-xr-x | Master/tlpkg/bin/ctan2tds | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds index efa61c775c1..aef80284c6c 100755 --- a/Master/tlpkg/bin/ctan2tds +++ b/Master/tlpkg/bin/ctan2tds @@ -1516,9 +1516,11 @@ sub setup { } sub donormal { - print "doing donormal()...\n"; - &setup; - chdir("$DEST/doc/$whichdocformat/$package"); + my ($ctrl) = @_; + + print "doing donormal($ctrl)...\n"; + &setup unless $ctrl eq "nosetup"; + &xchdir("$DEST/doc/$whichdocformat/$package"); &buildfilelist; # run the .ins files (if any) supplied @@ -1935,7 +1937,7 @@ sub MAKEnosymlinks { &SYSTEM("find . -type l | xargs --no-run-if-empty rm"); &buildfilelist; - &donormal; + &donormal ("nosetup"); } # do some stuff for simple packages with hyphenation files, like @@ -2352,9 +2354,9 @@ sub MAKEactive_conf { # example/ and source/ subdirs. Sigh. &setup (); &xchdir ($DOCDIR); - &SYSTEM ("mv example/* .; rmdir example"); - &SYSTEM ("mv source/* .; rmdir source"); - &donormal (); + &SYSTEM ("$MV example/* .; rmdir example"); + &SYSTEM ("$MV source/* .; rmdir source"); + &donormal ("nosetup"); } sub MAKEae { @@ -3217,7 +3219,6 @@ sub MAKEpst { killfiles($standardclean); &SYSTEM("mkdir -p $DEST/tex/latex/$package"); &SYSTEM("mv $DEST/tex/generic/$package/*sty $DEST/tex/latex/$package"); - &SYSTEM("mv $DEST/doc/generic/$package/*sty $DEST/tex/latex/$package"); &SYSTEM("mv $DEST/doc/generic/$package/*cfg $DEST/tex/latex/$package"); if (-f "scripts/ps4pdf") { |