Skip to content

Commit 5eb660e

Browse files
avargitster
authored andcommitted
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 <[email protected]> Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 3e9c6a0 commit 5eb660e

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

perl/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,18 @@ clean:
2323
ifdef NO_PERL_MAKEMAKER
2424
instdir_SQ = $(subst ','\'',$(prefix)/lib)
2525
$(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' >> $@
2828
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/' >> $@
2930
echo ' $(RM) blib/lib/Error.pm' >> $@
3031
'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
3132
echo ' cp private-Error.pm blib/lib/Error.pm' >> $@
3233
echo install: >> $@
3334
echo ' mkdir -p "$$(DESTDIR)$(instdir_SQ)"' >> $@
35+
echo ' mkdir -p "$$(DESTDIR)$(instdir_SQ)/Git"' >> $@
3436
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"' >> $@
3538
echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@
3639
'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
3740
echo ' cp private-Error.pm "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@

0 commit comments

Comments
 (0)