TODO: Note that '=' should sometimes count from the end of the buffer.

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index d579242c64174589dd70338c16d3a8175a4dfde9..3c2a629963ffad204a8f5e3c9006ae55e722bb12 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -1,5 +1,3 @@
-emacs: notmuch.elc
-
 notmuch_client_srcs =          \
        $(notmuch_compat_srcs)  \
        debugger.c              \
@@ -18,7 +16,8 @@ notmuch_client_srcs =         \
        notmuch-tag.c           \
        notmuch-time.c          \
        query-string.c          \
-       show-message.c
+       show-message.c          \
+       json.c
 
 notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
 notmuch: $(notmuch_client_modules) lib/notmuch.a
@@ -34,14 +33,22 @@ install: all notmuch.1.gz
        done ;
        install notmuch $(DESTDIR)$(prefix)/bin/
        install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/
+ifeq ($(MAKECMDGOALS), install)
+       @echo ""
+       @echo "Notmuch is now installed."
+       @echo ""
+       @echo "You may now want to install additional components to support using notmuch"
+       @echo "together with other software packages:"
+       @echo ""
+       @echo " make install-emacs"
+       @echo " make install-bash"
+       @echo " make install-zsh"
+       @echo ""
+endif
 
-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)
+install-desktop:
+       install -d $(DESTDIR)$(desktop_dir)
+       desktop-file-install --mode 0644 --dir $(DESTDIR)$(desktop_dir) notmuch.desktop
 
 install-bash:
        install -d $(DESTDIR)$(bash_completion_dir)