Merge branch 'maint-1.6.0' into maint

[git.git] / perl / Makefile.PL

diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index d401a6609bb552627dc3d85c53018d8941420687..320253eb8e91eb1d914aa4e34f7d3af4649b9b39 100644 (file)
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -3,7 +3,7 @@ use ExtUtils::MakeMaker;
 sub MY::postamble {
        return <<'MAKE_FRAG';
 instlibdir:
-       @echo '$(INSTALLSITEARCH)'
+       @echo '$(INSTALLSITELIB)'
 
 MAKE_FRAG
 }
@@ -12,20 +12,19 @@ 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 ($@) {
-       $pm{'Error.pm'} = '$(INST_LIBDIR)/Error.pm';
+eval { require Error };
+if ($@ || $Error::VERSION < 0.15009) {
+       $pm{'private-Error.pm'} = '$(INST_LIBDIR)/Error.pm';
 }
 
+# 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,
-       MYEXTLIB        => '../libgit.a',
-       INC             => '-I. -I..',
+       MAKEFILE        => 'perl.mak',
+       INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3'
 );
-
-
-use Devel::PPPort;
-
--s 'ppport.h' or Devel::PPPort::WriteFile();