X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile.local;h=bf81c03da1f75afe4de5e7a5e8c41037f99ec098;hp=27e42ba2938fc62357327f07d3a94862a7a90571;hb=4dec742eba1c6d7e3c024edab4992feef5a8d9bb;hpb=0d4b529297a5d1fbbd1e50231578b3e349fb52ce

diff --git a/Makefile.local b/Makefile.local
index 27e42ba2..bf81c03d 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	\
@@ -18,7 +20,7 @@ notmuch_client_srcs =		\
 
 notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
 notmuch: $(notmuch_client_modules) lib/notmuch.a
-	$(CXX) $(LDFLAGS) $^ -o $@
+	$(CXX) $^ $(LDFLAGS) -o $@
 
 notmuch.1.gz: notmuch.1
 	gzip --stdout notmuch.1 > notmuch.1.gz
@@ -31,9 +33,16 @@ install: all notmuch.1.gz
 	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-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