X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=perl%2FMakefile.PL;h=320253eb8e91eb1d914aa4e34f7d3af4649b9b39;hb=cab31fa076253fcfafa7572c24e40f12a1e09ae3;hp=9b117fd0d736615a8c4aeda742384956373d295a;hpb=9299c4f147bcff603eef187eb04fe38153571d30;p=git.git diff --git a/perl/Makefile.PL b/perl/Makefile.PL index 9b117fd0d..320253eb8 100644 --- a/perl/Makefile.PL +++ b/perl/Makefile.PL @@ -13,13 +13,10 @@ 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'; } -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"; @@ -29,5 +26,5 @@ WriteMakefile( VERSION_FROM => 'Git.pm', PM => \%pm, MAKEFILE => 'perl.mak', - %extra + INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3' );