Make bash completion directory configurable.

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 27e42ba2938fc62357327f07d3a94862a7a90571..3c9962409b60390eefbe5b04becb4f99f00a6a2f 100644 (file)
--- 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,22 +20,29 @@ 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
 
 install: all notmuch.1.gz
        for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man1 \
-               $(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