git-p4: After submission to p4 always synchronize from p4 again (into refs/remotes). Whether to rebase HEAD or not is still left as question to the end-user.

diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index 9b117fd0d736615a8c4aeda742384956373d295a..6aecd897f8fe5b69b1805e94a20c578c10246a4d 100644 (file)
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -13,7 +13,7 @@ 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';
 }
 
@@ -29,5 +29,6 @@ WriteMakefile(
        VERSION_FROM    => 'Git.pm',
        PM              => \%pm,
        MAKEFILE        => 'perl.mak',
+       INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3',
        %extra
 );