Merge branch 'maint'

diff --git a/contrib/emacs/Makefile b/contrib/emacs/Makefile
index d3619db510f4e4878eba49fcd80da3e78d564911..350846de904b31fb9dd86fee0c64613a7632c6aa 100644 (file)
--- a/contrib/emacs/Makefile
+++ b/contrib/emacs/Makefile
@@ -3,9 +3,9 @@
 EMACS = emacs
 
 ELC = git.elc vc-git.elc
-INSTALL = install
+INSTALL ?= install
 INSTALL_ELC = $(INSTALL) -m 644
-prefix = $(HOME)
+prefix ?= $(HOME)
 emacsdir = $(prefix)/share/emacs/site-lisp
 
 all: $(ELC)