Make git-pull complain and give advice when there is nothing to merge with

diff --git a/Makefile b/Makefile
index dace2112f903f6e5be8220deb3b1502496876bb1..42ba1d0fa7c7c2e1aeb5c499b09992d54b09cc21 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -783,7 +783,7 @@ perl/perl.mak: GIT-CFLAGS
 
 $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
        $(QUIET_GEN)$(RM) $@ $@+ && \
-       INSTLIBDIR=`$(MAKE) -C perl -s --no-print-directory instlibdir` && \
+       INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
        sed -e '1{' \
            -e '        s|#!.*perl|#!$(PERL_PATH_SQ)|' \
            -e '        h' \