From d24ad9b0144273dc4290caa8670a887196818b8d Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 12 Dec 2007 07:48:56 +0000 Subject: add one additional argument to MAKEcopy that copies from $packagedir/$add_arg instead of $packagedir Use that for the installation of pgf and call MAKEcopy("....pgf","base"); git-svn-id: svn://tug.org/texlive/trunk@5760 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/bin/ctan2tds | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Master') diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds index eaf85e9c50b..efb9145b20e 100755 --- a/Master/tlpkg/bin/ctan2tds +++ b/Master/tlpkg/bin/ctan2tds @@ -1305,11 +1305,13 @@ sub xchdir # sub MAKEcopy { my $dest = $_[0] || $DEST; + my $pdir = $packagedir; + if (defined($_[1])) { $pdir .= "/$_[1]"; } - chomp (my $abspackagedir = `cd $packagedir && pwd`); + chomp (my $abspackagedir = `cd $pdir && pwd`); print "\t COPY from $abspackagedir to $dest\n"; - &xchdir ($packagedir); + &xchdir ($pdir); &SYSTEM ("mkdir -p $dest"); # do the copy. @@ -2085,7 +2087,7 @@ sub MAKEperltex { sub MAKEpgf { print "\t SPECIAL pgf\n"; - &MAKEcopy ("$DEST/tex"); + &MAKEcopy ("$DEST/tex", "base"); chdir ("$DEST/tex") || die "chdir($DEST/tex) failed: $!"; print "\t SPECIAL move tex/doc/generic/pgf to doc/generic/pgf\n"; -- cgit v1.2.3