Merge branch 'maint'

diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index ef9d82d7b63f0c2bee5777025450af4c5eb3abb2..9b117fd0d736615a8c4aeda742384956373d295a 100644 (file)
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -3,12 +3,7 @@ use ExtUtils::MakeMaker;
 sub MY::postamble {
        return <<'MAKE_FRAG';
 instlibdir:
-       @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
+       @echo '$(INSTALLSITELIB)'
 
 MAKE_FRAG
 }
@@ -25,11 +20,14 @@ if ($@) {
 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,
-       MYEXTLIB        => '../libgit.a',
-       INC             => '-I. -I..',
+       MAKEFILE        => 'perl.mak',
        %extra
 );