Merge branch 'maint-1.6.0' into maint-1.6.1

diff --git a/perl/Makefile b/perl/Makefile
index 2fceff27910d45359bd9955745a92020f501cd0e..e3dd1a5547c471208c445d77263ee46e64b37451 100644 (file)
--- a/perl/Makefile
+++ b/perl/Makefile
@@ -6,7 +6,7 @@ makfile:=perl.mak
 PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
 prefix_SQ = $(subst ','\'',$(prefix))
 
-ifdef QUIET_MAKE
+ifndef V
        QUIET = @
 endif
 
@@ -22,22 +22,26 @@ clean:
 ifdef NO_PERL_MAKEMAKER
 instdir_SQ = $(subst ','\'',$(prefix)/lib)
 $(makfile): ../GIT-CFLAGS Makefile
-       echo all: > $@
-       echo '  :' >> $@
+       echo all: private-Error.pm Git.pm > $@
+       echo '  mkdir -p blib/lib' >> $@
+       echo '  $(RM) blib/lib/Git.pm; cp Git.pm blib/lib/' >> $@
+       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 $(instdir_SQ)' >> $@
-       echo '  $(RM) $(instdir_SQ)/Git.pm; cp Git.pm $(instdir_SQ)' >> $@
-       echo '  $(RM) $(instdir_SQ)/Error.pm; \
-       cp private-Error.pm $(instdir_SQ)/Error.pm' >> $@
+       echo '  mkdir -p "$(instdir_SQ)"' >> $@
+       echo '  $(RM) "$(instdir_SQ)/Git.pm"; cp Git.pm "$(instdir_SQ)"' >> $@
+       echo '  $(RM) "$(instdir_SQ)/Error.pm"' >> $@
+       '$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
+       echo '  cp private-Error.pm "$(instdir_SQ)/Error.pm"' >> $@
        echo instlibdir: >> $@
        echo '  echo $(instdir_SQ)' >> $@
 else
 $(makfile): Makefile.PL ../GIT-CFLAGS
-       '$(PERL_PATH_SQ)' $< PREFIX='$(prefix_SQ)'
+       $(PERL_PATH) $< PREFIX='$(prefix_SQ)'
 endif
 
 # this is just added comfort for calling make directly in perl dir
 # (even though GIT-CFLAGS aren't used yet. If ever)
 ../GIT-CFLAGS:
        $(MAKE) -C .. GIT-CFLAGS
-