fast-import: prevent producing bad delta

diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index 97ee9af9c9834d759c33b17bca7b66eaef200e4f..0b9deca2cc6ef77897a23b2096a7acdd577c2482 100644 (file)
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -3,12 +3,15 @@ use ExtUtils::MakeMaker;
 sub MY::postamble {
        return <<'MAKE_FRAG';
 instlibdir:
-       @echo '$(INSTALLSITEARCH)'
+       @echo '$(INSTALLSITELIB)'
 
-check:
-       perl -MDevel::PPPort -le 'Devel::PPPort::WriteFile(".ppport.h")' && \
-       perl .ppport.h --compat-version=5.6.0 Git.xs && \
-       rm .ppport.h
+ifneq (,$(DESTDIR))
+ifeq (0,$(shell expr '$(MM_VERSION)' '>' 6.10))
+$(error ExtUtils::MakeMaker version "$(MM_VERSION)" is older than 6.11 and so \
+       is likely incompatible with the DESTDIR mechanism.  Try setting \
+       NO_PERL_MAKEMAKER=1 instead)
+endif
+endif
 
 MAKE_FRAG
 }
@@ -18,14 +21,18 @@ 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';
 }
 
+# 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'
 );