fix Makefile.local to install bash completion definitions as not executable

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 5474efc66d30226380d0992b530b4effc14fec30..b8186277e87933c2bb8f1e03705b4fc4a9818d21 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -1,16 +1,51 @@
-all: notmuch
+all: notmuch notmuch.1.gz
 
-notmuch: notmuch.o lib/notmuch.a
-       $(CC) $(NOTMUCH_LDFLAGS) $^ -o $@
+emacs: notmuch.elc
 
-notmuch.1.gz:
-       gzip --stdout notmuch.1 > notmuch.1.gz
+notmuch_client_srcs =          \
+       debugger.c              \
+       gmime-filter-reply.c    \
+       notmuch.c               \
+       notmuch-config.c        \
+       notmuch-count.c         \
+       notmuch-dump.c          \
+       notmuch-new.c           \
+       notmuch-reply.c         \
+       notmuch-restore.c       \
+       notmuch-search.c        \
+       notmuch-search-tags.c   \
+       notmuch-setup.c         \
+       notmuch-show.c          \
+       notmuch-tag.c           \
+       notmuch-time.c          \
+       query-string.c          \
+       show-message.c
+
+notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
+notmuch: $(notmuch_client_modules) lib/notmuch.a
+       $(call quiet,CXX) $^ $(LDFLAGS) -o $@
+
+notmuch.1.gz: notmuch.1
+       $(call quiet,gzip) --stdout $^ > $@
 
 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 \
-               $(DESTDIR)/etc/bash_completion.d/notmuch
+       for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man1 \
+               $(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 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.c
-CLEAN := $(CLEAN) notmuch *.o
+SRCS  := $(SRCS) $(notmuch_client_srcs)
+CLEAN := $(CLEAN) notmuch $(notmuch_client_modules) notmuch.elc notmuch.1.gz