X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile.local;h=27e42ba2938fc62357327f07d3a94862a7a90571;hp=b049e5bf994182201c17b7f247e07df6c59ca740;hb=829dac9a1b4aaadcd0238f72b3bc61c9ce936110;hpb=305e76bc0ab2e7f3bd1ff2580e8d5dac8b4a7164

diff --git a/Makefile.local b/Makefile.local
index b049e5bf..27e42ba2 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -1,4 +1,4 @@
-all: notmuch
+all: notmuch notmuch.1.gz
 
 notmuch_client_srcs =		\
 	notmuch.c		\
@@ -12,22 +12,27 @@ notmuch_client_srcs =		\
 	notmuch-show.c		\
 	notmuch-tag.c		\
 	notmuch-time.c		\
-	add-files.c		\
 	gmime-filter-reply.c	\
 	query-string.c		\
 	show-message.c
 
 notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
 notmuch: $(notmuch_client_modules) lib/notmuch.a
-	$(CC) $(LDFLAGS) $^ -o $@
+	$(CXX) $(LDFLAGS) $^ -o $@
 
-notmuch.1.gz:
+notmuch.1.gz: notmuch.1
 	gzip --stdout notmuch.1 > notmuch.1.gz
 
 install: all notmuch.1.gz
-	install -C -D notmuch $(DESTDIR)/usr/bin/notmuch
-	install -C -D notmuch.1.gz $(DESTDIR)/usr/share/man/man1
-	install -C -D notmuch-completion.bash \
+	for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man1 \
+		$(DESTDIR)/etc/bash_completion.d/ ; \
+	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
 
 SRCS  := $(SRCS) $(notmuch_client_srcs)