X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=perl%2FMakefile.PL;h=437516142cb6c14f197dc5821635a6ff8bc91adf;hb=e58db03bbee4af96e60b6ac88b84c1c11b8b037e;hp=de73235e4c3142381c4ea01597e18b14cd65bc02;hpb=e0d68cd5d95fc15342db38c211f71efe5bcfbe94;p=git.git

diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index de73235e4..437516142 100644
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -13,16 +13,21 @@ my %pm = ('Git.pm' => '$(INST_LIBDIR)/Git.pm');
 # We come with our own bundled Error.pm. It's not in the set of default
 # Perl modules so install it if it's not available on the system yet.
 eval { require Error };
-if ($@) {
+if ($@ || $Error::VERSION < 0.15009) {
 	$pm{'private-Error.pm'} = '$(INST_LIBDIR)/Error.pm';
 }
 
 my %extra;
 $extra{DESTDIR} = $ENV{DESTDIR} if $ENV{DESTDIR};
 
+# redirect stdout, otherwise the message "Writing perl.mak for Git"
+# disrupts the output for the target 'instlibdir'
+open STDOUT, ">&STDERR";
+
 WriteMakefile(
 	NAME            => 'Git',
 	VERSION_FROM    => 'Git.pm',
 	PM		=> \%pm,
+	MAKEFILE	=> 'perl.mak',
 	%extra
 );