Teach "git-read-tree -u" to check out submodules as a directory

diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index 92c140d39b662c10204cf54bcd906793b2a1279b..9b117fd0d736615a8c4aeda742384956373d295a 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,22 @@ 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};
+
+# 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
 );
-
-
-use Devel::PPPort;
-
--s 'ppport.h' or Devel::PPPort::WriteFile();