Change 16468: Various BuildTools fixes, MacPerl Bug #545341

Change 16468 by pudge@pudge-mobile on 2002/05/08 03:48:15

	Various BuildTools fixes, MacPerl Bug #545341

Affected files ...

.... //depot/macperl/macos/lib/Mac/BuildTools.pm#2 edit
.... //depot/maint-5.6/macperl/macos/lib/Mac/BuildTools.pm#4 edit

Differences ...

==== //depot/macperl/macos/lib/Mac/BuildTools.pm#2 (text) ====
Index: macperl/macos/lib/Mac/BuildTools.pm
--- macperl/macos/lib/Mac/BuildTools.pm#1~16123~	Tue Apr 23 18:25:17 2002
+++ macperl/macos/lib/Mac/BuildTools.pm	Tue May  7 20:48:15 2002
@@ -20,8 +20,8 @@
 	$cwd = cwd();
 
 	undef $@;
-	unless (eval { do ":Makefile.PL" }) {
-		warn "Can't do :Makefile.PL in $cwd: $@\n";
+	unless (eval { package main; do ":Makefile.PL" }) {
+		warn "Can't do ${cwd}Makefile.PL: $@\n";
 	}
 	warn $@ if $@;
 
@@ -81,6 +81,10 @@
 	# taken from PerlInstall
 	my(%dirs, $dir, $d);
 	$dirs{lib} = "$ENV{MACPERL}site_perl";
+	while (-l $dirs{lib}) {
+		$dirs{lib} = readlink $dirs{lib};
+	}
+	$dirs{lib} =~ s/:$//;
 	chomp($dir = `pwd`);
 
 	$dir .= ":" unless ($dir =~ /:$/);
@@ -103,7 +107,7 @@
 		mkpath($newdir, 1);
 
 		if (!copy($_, "$newdir:$_")) {
-			die $^E unless -e "$newdir:$_";
+			die "'$newdir:$_' does not exist" unless -e "$newdir:$_";
 			printf("    Moving %-20s -> %s\nDelete old file manually\n",
 				"$newdir:$_", "$newdir:$_ old");
 			move "$newdir:$_", "$newdir:$_ old";

==== //depot/maint-5.6/macperl/macos/lib/Mac/BuildTools.pm#4 (text) ====
Index: macperl/macos/lib/Mac/BuildTools.pm
--- macperl/macos/lib/Mac/BuildTools.pm#3~12575~	Mon Oct 22 11:56:34 2001
+++ macperl/macos/lib/Mac/BuildTools.pm	Tue May  7 20:48:15 2002
@@ -20,8 +20,8 @@
 	$cwd = cwd();
 
 	undef $@;
-	unless (eval { do ":Makefile.PL" }) {
-		warn "Can't do :Makefile.PL in $cwd: $@\n";
+	unless (eval { package main; do ":Makefile.PL" }) {
+		warn "Can't do ${cwd}Makefile.PL: $@\n";
 	}
 	warn $@ if $@;
 
@@ -81,6 +81,10 @@
 	# taken from PerlInstall
 	my(%dirs, $dir, $d);
 	$dirs{lib} = "$ENV{MACPERL}site_perl";
+	while (-l $dirs{lib}) {
+		$dirs{lib} = readlink $dirs{lib};
+	}
+	$dirs{lib} =~ s/:$//;
 	chomp($dir = `pwd`);
 
 	$dir .= ":" unless ($dir =~ /:$/);
@@ -103,7 +107,7 @@
 		mkpath($newdir, 1);
 
 		if (!copy($_, "$newdir:$_")) {
-			die $^E unless -e "$newdir:$_";
+			die "'$newdir:$_' does not exist" unless -e "$newdir:$_";
 			printf("    Moving %-20s -> %s\nDelete old file manually\n",
 				"$newdir:$_", "$newdir:$_ old");
 			move "$newdir:$_", "$newdir:$_ old";
End of Patch.