From: Eric Wong <normalperson@yhbt.net>
Date: Sat, 21 Apr 2007 07:55:00 +0000 (-0700)
Subject: perl: install private Error.pm if the site version is older than our own
X-Git-Tag: v1.5.1.2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4a40cbd949d81863375a10e320f74c8fc595d05e;p=git.git

perl: install private Error.pm if the site version is older than our own

bdash (on IRC) had a problem with Git.pm (via git-svn) when his
site installation of Error.pm was older than the version we
package.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index 9b117fd0d..437516142 100644
--- 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';
 }