Sync with 1.7.9.5

diff --git a/perl/Makefile b/perl/Makefile
index b2977cd0bc8f23d75a228ca13d6cb42e1c72628f..3e21766d8f08aacabb965adf73aabfeeaad9de7a 100644 (file)
--- a/perl/Makefile
+++ b/perl/Makefile
@@ -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"' >> $@