summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2006-05-23 20:49:32 +0000
committerKarl Berry <karl@freefriends.org>2006-05-23 20:49:32 +0000
commitd5edbfb2290391fa1e9cd218c042f0711c0ea78b (patch)
treee24f343604da35291a61dd8f02b249620cdd5c00
parenta0656ca84ce9566ca07f791707f6f26d7e6942c8 (diff)
find tools dir properly, don't remove tpm or lists file
git-svn-id: svn://tug.org/texlive/trunk@1585 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/cdbuild/place7
1 files changed, 4 insertions, 3 deletions
diff --git a/Build/cdbuild/place b/Build/cdbuild/place
index 4ecf8babf76..da645cb025d 100755
--- a/Build/cdbuild/place
+++ b/Build/cdbuild/place
@@ -58,10 +58,11 @@ xchdir ("$mydir/$package");
find (\&files,".");
foreach $file (keys %Old) {
print "* $file: [retained=$New{$file}]\n";
- if (! $New{$file}) {
+ # don't remove tpm or lists file, they won't be in the new package
+ if (! $New{$file} && $file !~ /\.tpm$/ && $file !~ m,/lists/[^/]+$,) {
&my_system ("svn remove $M/$file");
- $dirs{dirname ("$M/$file")}++;
}
+ $dirs{dirname ("$M/$file")}++;
}
# copy files
@@ -87,7 +88,7 @@ if ($Root eq 'texmf-doc') {
die "cannot handle Root=$Root";
}
-chomp (my $tools = `cd $mydir/../tools && pwd`);
+chomp (my $tools = `cd $mydir/../../tools && pwd`);
$SETUP = "$tools/tpm-factory.pl --master=$M --tpm_dir=$tpmdir"
. " --ftp_dir=/var/tmp --arch=all --patterns=auto"