Merge branch 'master-for-junio' of git://repo.or.cz/git/fastimport; branch 'maint'

diff --git a/contrib/emacs/Makefile b/contrib/emacs/Makefile
index d3619db510f4e4878eba49fcd80da3e78d564911..8554e3967cc692c6916e5aee35952074d07e8bf0 100644 (file)
--- a/contrib/emacs/Makefile
+++ b/contrib/emacs/Makefile
@@ -2,10 +2,10 @@
 
 EMACS = emacs
 
-ELC = git.elc vc-git.elc
-INSTALL = install
+ELC = git.elc vc-git.elc git-blame.elc
+INSTALL ?= install
 INSTALL_ELC = $(INSTALL) -m 644
-prefix = $(HOME)
+prefix ?= $(HOME)
 emacsdir = $(prefix)/share/emacs/site-lisp
 
 all: $(ELC)
@@ -15,6 +15,6 @@ install: all
        $(INSTALL_ELC) $(ELC) $(emacsdir)
 
 %.elc: %.el
-       $(EMACS) --batch --eval '(byte-compile-file "$<")'
+       $(EMACS) -batch -f batch-byte-compile $<
 
 clean:; rm -f $(ELC)