From: Nicholas Clark <nick@ccl4.org>
Date: Fri, 30 Jan 2009 23:12:24 +0000 (+0000)
Subject: The logic to set $makefile to 'Makefile.old' can't work, so remove it.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=d793a8a7f7f2bd8f80c6af1cbf5a405a3d09d08a;p=p5sagit%2Fp5-mst-13.2.git

The logic to set $makefile to 'Makefile.old' can't work, so remove it.
(Makefile.old is created by running make clean in an extension, and make clean
at the top level removes ./miniperl, so there won't be a miniperl to run
make_ext.pl. The Makefile.old logic was valid for the shell script version.
Remove $makeopts, which was missed from the make command in the transcription
from shell to Perl.
---

diff --git a/make_ext.pl b/make_ext.pl
index d0c6328..555ed2d 100644
--- a/make_ext.pl
+++ b/make_ext.pl
@@ -97,7 +97,6 @@ $mname =~ s!/!::!g;
 my $depth = $pname;
 $depth =~ s![^/]+!..!g;
 my $makefile = "Makefile";
-my $makeopts = '';
 
 if (not -d "ext/$pname") {
 	print "\tSkipping $extspec (directory does not exist)\n";
@@ -133,13 +132,6 @@ elsif ($target eq 'nonxs') {
 	$target   = 'all';
 }
 elsif ($target =~ /clean$/) {
-	# If Makefile has been moved to Makefile.old by a make clean
-	# then use Makefile.old for realclean rather than rebuild it
-	if (! -f $makefile and -f "Makefile.old") {
-		$makefile = "Makefile.old";
-		$makeopts = "-f $makefile";
-		print "Note: Using Makefile.old\n";
-	}
 }
 elsif ($target eq '') {
 	print "make_ext: no make target specified (eg static or dynamic)\n";