Merge branch 'master' into pb/gitpm

diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index 92c140d39b662c10204cf54bcd906793b2a1279b..ef9d82d7b63f0c2bee5777025450af4c5eb3abb2 100644 (file)
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -3,7 +3,12 @@ use ExtUtils::MakeMaker;
 sub MY::postamble {
        return <<'MAKE_FRAG';
 instlibdir:
-       @echo $(INSTALLSITEARCH)
+       @echo '$(INSTALLSITEARCH)'
+
+check:
+       perl -MDevel::PPPort -le 'Devel::PPPort::WriteFile(".ppport.h")' && \
+       perl .ppport.h --compat-version=5.6.0 Git.xs && \
+       rm .ppport.h
 
 MAKE_FRAG
 }
@@ -12,20 +17,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' };
+eval { require Error };
 if ($@) {
-       $pm{'Error.pm'} = '$(INST_LIBDIR)/Error.pm';
+       $pm{'private-Error.pm'} = '$(INST_LIBDIR)/Error.pm';
 }
 
+my %extra;
+$extra{DESTDIR} = $ENV{DESTDIR} if $ENV{DESTDIR};
+
 WriteMakefile(
        NAME            => 'Git',
        VERSION_FROM    => 'Git.pm',
        PM              => \%pm,
        MYEXTLIB        => '../libgit.a',
        INC             => '-I. -I..',
+       %extra
 );
-
-
-use Devel::PPPort;
-
--s 'ppport.h' or Devel::PPPort::WriteFile();