author | Junio C Hamano <gitster@pobox.com> | |
Fri, 16 Mar 2012 16:16:17 +0000 (09:16 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 16 Mar 2012 16:16:17 +0000 (09:16 -0700) |
* ab/perl-i18n:
perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER
Git::I18N: compatibility with perl <5.8.3
perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER
Git::I18N: compatibility with perl <5.8.3
perl/Git/I18N.pm | patch | blob | history | |
perl/Makefile | patch | blob | history |
diff --git a/perl/Git/I18N.pm b/perl/Git/I18N.pm
index 07597dcb93a772caf7b676722c99d330ae947c47..40dd8971912d6b387bde7c9bb04cc6896521acec 100644 (file)
--- a/perl/Git/I18N.pm
+++ b/perl/Git/I18N.pm
use 5.008;
use strict;
use warnings;
-use Exporter 'import';
+BEGIN {
+ require Exporter;
+ if ($] < 5.008003) {
+ *import = \&Exporter::import;
+ } else {
+ # Exporter 5.57 which supports this invocation was
+ # released with perl 5.8.3
+ Exporter->import('import');
+ }
+}
our @EXPORT = qw(__);
our @EXPORT_OK = @EXPORT;
diff --git a/perl/Makefile b/perl/Makefile
index b2977cd0bc8f23d75a228ca13d6cb42e1c72628f..3e21766d8f08aacabb965adf73aabfeeaad9de7a 100644 (file)
--- a/perl/Makefile
+++ b/perl/Makefile
ifdef NO_PERL_MAKEMAKER
instdir_SQ = $(subst ','\'',$(prefix)/lib)
$(makfile): ../GIT-CFLAGS Makefile
- echo all: private-Error.pm Git.pm > $@
- echo ' mkdir -p blib/lib' >> $@
+ echo all: private-Error.pm Git.pm Git/I18N.pm > $@
+ echo ' mkdir -p blib/lib/Git' >> $@
echo ' $(RM) blib/lib/Git.pm; cp Git.pm blib/lib/' >> $@
+ echo ' $(RM) blib/lib/Git/I18N.pm; cp Git/I18N.pm blib/lib/Git/' >> $@
echo ' $(RM) blib/lib/Error.pm' >> $@
'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
echo ' cp private-Error.pm blib/lib/Error.pm' >> $@
echo install: >> $@
echo ' mkdir -p "$$(DESTDIR)$(instdir_SQ)"' >> $@
+ echo ' mkdir -p "$$(DESTDIR)$(instdir_SQ)/Git"' >> $@
echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Git.pm"; cp Git.pm "$$(DESTDIR)$(instdir_SQ)"' >> $@
+ echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Git/I18N.pm"; cp Git/I18N.pm "$$(DESTDIR)$(instdir_SQ)/Git"' >> $@
echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@
'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
echo ' cp private-Error.pm "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@