From: Steve Peters <steve@fisharerojo.org>
Date: Fri, 2 May 2008 15:36:39 +0000 (+0000)
Subject: Tweaks to Digest-SHA's Makefile.PL that casued problems
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=47c27f0161f4928f1bf7dc05e2bd6a5f2346dddf;p=p5sagit%2Fp5-mst-13.2.git

Tweaks to Digest-SHA's Makefile.PL that casued problems
in the core.

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

diff --git a/ext/Digest/SHA/Makefile.PL b/ext/Digest/SHA/Makefile.PL
index df63c2b..2402db2 100644
--- a/ext/Digest/SHA/Makefile.PL
+++ b/ext/Digest/SHA/Makefile.PL
@@ -34,10 +34,19 @@ 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',
 	),
+==== YOURS Makefile.PL
+	'MAN3PODS'	=> {},      # Pods will be built by installman.
+	'NO_META'	=> 1,
+	'INSTALLDIRS'	=> ($] >= 5.010) ? 'perl' : 'site',
+<<<<
 );
 
 my $MMversion = $ExtUtils::MakeMaker::VERSION || 0;