perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER
When I added the i18n infrastructure in v1.7.8-rc2-1-g5e9637c I forgot to install Git::I18N also when NO_PERL_MAKEMAKER=YesPlease was set. Change the generation of the fallback perl.mak file to do that. Now Git/I18N.pm is installed alongside Git.pm in such a way that anything that uses GITPERLLIB will find it. Reported-by: Tom G. Christensen <tgc@statsbiblioteket.dk> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Mar 10, 2012 at 12:29 UTC
5eb660ecd1965c67be0051c46b8e8a56b28ff5b2
1 file changed
+5
-2
perl/Makefile
+5
-2
@@ -23,15 +23,18 @@ clean:
23
ifdef NO_PERL_MAKEMAKER
24
instdir_SQ = $(subst ','\'',$(prefix)/lib)
25
$(makfile): ../GIT-CFLAGS Makefile
26
- echo all: private-Error.pm Git.pm > $@
27
- echo ' mkdir -p blib/lib' >> $@
26
+ echo all: private-Error.pm Git.pm Git/I18N.pm > $@
27
+ echo ' mkdir -p blib/lib/Git' >> $@
28
echo ' $(RM) blib/lib/Git.pm; cp Git.pm blib/lib/' >> $@
29
+ echo ' $(RM) blib/lib/Git/I18N.pm; cp Git/I18N.pm blib/lib/Git/' >> $@
30
echo ' $(RM) blib/lib/Error.pm' >> $@
31
'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
32
echo ' cp private-Error.pm blib/lib/Error.pm' >> $@
33
echo install: >> $@
34
echo ' mkdir -p "$$(DESTDIR)$(instdir_SQ)"' >> $@
35
+ echo ' mkdir -p "$$(DESTDIR)$(instdir_SQ)/Git"' >> $@
36
echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Git.pm"; cp Git.pm "$$(DESTDIR)$(instdir_SQ)"' >> $@
37
+ echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Git/I18N.pm"; cp Git/I18N.pm "$$(DESTDIR)$(instdir_SQ)/Git"' >> $@
38
echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@
39
'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
40
echo ' cp private-Error.pm "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@