зеркало из https://github.com/microsoft/git.git
Merge branch 'ab/perl-i18n'
* ab/perl-i18n: perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER Git::I18N: compatibility with perl <5.8.3
This commit is contained in:
Коммит
f524129737
|
@ -2,7 +2,16 @@ package Git::I18N;
|
|||
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;
|
||||
|
|
|
@ -23,15 +23,18 @@ clean:
|
|||
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"' >> $@
|
||||
|
|
Загрузка…
Ссылка в новой задаче