Merge in GIT 1.5.3.8

diff --git a/contrib/emacs/Makefile b/contrib/emacs/Makefile
index 8554e3967cc692c6916e5aee35952074d07e8bf0..a48540a92b4aa5140a87469b36c1f9b3d8e46e7f 100644 (file)
--- a/contrib/emacs/Makefile
+++ b/contrib/emacs/Makefile
@@ -7,14 +7,15 @@ INSTALL ?= install
 INSTALL_ELC = $(INSTALL) -m 644
 prefix ?= $(HOME)
 emacsdir = $(prefix)/share/emacs/site-lisp
+RM ?= rm -f
 
 all: $(ELC)
 
 install: all
-       $(INSTALL) -d $(emacsdir)
-       $(INSTALL_ELC) $(ELC) $(emacsdir)
+       $(INSTALL) -d $(DESTDIR)$(emacsdir)
+       $(INSTALL_ELC) $(ELC:.elc=.el) $(ELC) $(DESTDIR)$(emacsdir)
 
 %.elc: %.el
        $(EMACS) -batch -f batch-byte-compile $<
 
-clean:; rm -f $(ELC)
+clean:; $(RM) $(ELC)