X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile.local;h=2d5409659ec3e1930e40a37d41020b05c154ebf6;hp=aff7d2c0e665eb8d284ce4db4558c7294999bf24;hb=3650f4d1950e923ea5d28e76a321ce0d62f810de;hpb=7c2c26bc4ec5fdab5c6fa72ea325d846b46929e3

diff --git a/Makefile.local b/Makefile.local
index aff7d2c0..2d540965 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -1,8 +1,7 @@
-all: notmuch notmuch.1.gz
-
 emacs: notmuch.elc
 
 notmuch_client_srcs =		\
+	$(notmuch_compat_srcs)	\
 	debugger.c		\
 	gmime-filter-reply.c	\
 	notmuch.c		\
@@ -23,12 +22,12 @@ notmuch_client_srcs =		\
 
 notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
 notmuch: $(notmuch_client_modules) lib/notmuch.a
-	$(call quiet,CXX) $^ $(LDFLAGS) -o $@
+	$(call quiet,CXX,$(LDFLAGS)) $^ $(FINAL_LDFLAGS) -o $@
 
 notmuch.1.gz: notmuch.1
 	$(call quiet,gzip) --stdout $^ > $@
 
-install: all notmuch.1.gz
+install: all notmuch.1.gz install-emacs install-bash
 	for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man1 ; \
 	do \
 		install -d $$d ; \
@@ -36,7 +35,7 @@ install: all notmuch.1.gz
 	install notmuch $(DESTDIR)$(prefix)/bin/
 	install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/
 
-install-emacs: install emacs
+install-emacs: emacs
 	for d in $(DESTDIR)/$(emacs_lispdir) ; \
 	do \
 		install -d $$d ; \
@@ -46,7 +45,7 @@ install-emacs: install emacs
 
 install-bash:
 	install -d $(DESTDIR)$(bash_completion_dir)
-	install contrib/notmuch-completion.bash \
+	install -m0644 contrib/notmuch-completion.bash \
 		$(DESTDIR)$(bash_completion_dir)/notmuch
 
 SRCS  := $(SRCS) $(notmuch_client_srcs)