X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile.local;h=3c9962409b60390eefbe5b04becb4f99f00a6a2f;hp=c44d160378ea7f89f7f98f8dfff941aa825a00b9;hb=a8e0d4f25f78d3dcd8651ebb096f1c3d86037e72;hpb=ddac17343a30976cae82c9f57419c063e1585cc0

diff --git a/Makefile.local b/Makefile.local
index c44d1603..3c996240 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -1,5 +1,7 @@
 all: notmuch notmuch.1.gz
 
+emacs: notmuch.elc
+
 notmuch_client_srcs =		\
 	notmuch.c		\
 	notmuch-config.c	\
@@ -25,15 +27,22 @@ notmuch.1.gz: notmuch.1
 
 install: all notmuch.1.gz
 	for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man1 \
-		$(DESTDIR)/$(prefix)/share/emacs/site-lisp/ $(DESTDIR)/etc/bash_completion.d/ ; \
+		$(DESTDIR)$(bash_completion_dir) ; \
 	do \
 		install -d $$d ; \
 	done ;
 	install notmuch $(DESTDIR)$(prefix)/bin/
 	install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/
-	install -m0644 notmuch.el $(DESTDIR)$(prefix)/share/emacs/site-lisp/
-	install notmuch-completion.bash \
-		$(DESTDIR)/etc/bash_completion.d/notmuch
+	install contrib/notmuch-completion.bash \
+		$(DESTDIR)$(bash_completion_dir)/notmuch
+
+install-emacs: install emacs
+	for d in $(DESTDIR)/$(emacs_lispdir) ; \
+	do \
+		install -d $$d ; \
+	done ;
+	install -m0644 notmuch.el $(DESTDIR)$(emacs_lispdir)
+	install -m0644 notmuch.elc $(DESTDIR)$(emacs_lispdir)
 
 SRCS  := $(SRCS) $(notmuch_client_srcs)
-CLEAN := $(CLEAN) notmuch $(notmuch_client_modules)
+CLEAN := $(CLEAN) notmuch $(notmuch_client_modules) notmuch.elc notmuch.1.gz