From: Steve Peters <steve@fisharerojo.org>
Date: Fri, 2 May 2008 15:38:46 +0000 (+0000)
Subject: Somedays, Perforce makes me cranky.  Fix perforce resolve
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=058e2a45ff7295423ed92d46fc2e37c08c1b034c;p=p5sagit%2Fp5-mst-13.2.git

Somedays, Perforce makes me cranky.  Fix perforce resolve
of the changes to Digest-SHA's Makefile.PL.

p4raw-id: //depot/perl@33782
---

diff --git a/ext/Digest/SHA/Makefile.PL b/ext/Digest/SHA/Makefile.PL
index 2402db2..dff8270 100644
--- a/ext/Digest/SHA/Makefile.PL
+++ b/ext/Digest/SHA/Makefile.PL
@@ -34,19 +34,11 @@ my %att = (
 	'LIBS'		=> [''],
 	'DEFINE'	=> $define,
 	'INC'		=> '-I.',
->>>> ORIGINAL Makefile.PL#3
-	'EXE_FILES'	=> [ 'shasum' ],
-	'INSTALLDIRS'	=> ($] >= 5.010) ? 'perl' : 'site',
-==== THEIRS Makefile.PL#4
 	$PERL_CORE ? () : (
 	    'EXE_FILES'		=> [ 'shasum' ],
 	    'INSTALLDIRS'	=> ($] >= 5.010) ? 'perl' : 'site',
+            'MAN3PODS'      => {},      # Pods will be built by installman.
 	),
-==== YOURS Makefile.PL
-	'MAN3PODS'	=> {},      # Pods will be built by installman.
-	'NO_META'	=> 1,
-	'INSTALLDIRS'	=> ($] >= 5.010) ? 'perl' : 'site',
-<<<<
 );
 
 my $MMversion = $ExtUtils::MakeMaker::VERSION || 0;