Change 33782: Somedays, Perforce makes me cranky. Fix perforce resolve

Change 33782 by stevep@stevep-kirk on 2008/05/02 15:38:46

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

Affected files ...

... //depot/perl/ext/Digest/SHA/Makefile.PL#6 edit

Differences ...

==== //depot/perl/ext/Digest/SHA/Makefile.PL#6 (text) ====
Index: perl/ext/Digest/SHA/Makefile.PL
--- perl/ext/Digest/SHA/Makefile.PL#5~33781~	2008-05-02 08:36:39.000000000 -0700
+++ perl/ext/Digest/SHA/Makefile.PL	2008-05-02 08:38:46.000000000 -0700
@@ -34,19 +34,11 @@
 	'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;
End of Patch.

• Change 33782: Somedays, Perforce makes me cranky. Fix perforce resolve by Steve Peters