Improve installation of emacs mode.

1) Add a separate targets to build and install emacs mode.

2) Don't hardcode the installation directory, instead use emacs'
   pkg-config module.

3) Install a byte compiled version of the emacs mode.

4) Install the emacs mode in emacs' site-lisp directory.  Put
   "(require 'notmuch)" in your .emacs to load it automatically.

5) Ignore byte-compiled emacs files.

Signed-off-by: Jeffrey C. Ollie <jeff@ocjtech.us>
Reviewed-by: Ingmar Vanhassel <ingmar@exherbo.org>
Reviewed-by: Keith Packard <keithp@keithp.com>

diff --git a/.gitignore b/.gitignore
index ef515f2f21b5bdf69e03d1fa25d1d02f23e47f80..8794354e547115484fd0fd2d99ae2496d88c9cda 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@ notmuch.1.gz
 *.[ao]
 *~
 .*.swp
-
+*.elc

diff --git a/Makefile b/Makefile
index 023b2ec85fed32059dae867386a189573b5e0e66..17fa4a2206bd520e02270223bb6d380e2ec26f54 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,9 @@ CFLAGS=-O2
 extra_cflags := $(shell pkg-config --cflags glib-2.0 gmime-2.4 talloc)
 extra_cxxflags := $(shell xapian-config --cxxflags)
 
+emacs_lispdir := $(shell pkg-config emacs --variable sitepkglispdir)
+emacs_startdir := $(shell pkg-config emacs --variable sitestartdir)
+
 # Now smash together user's values with our extra values
 override CFLAGS += $(WARN_FLAGS) $(extra_cflags)
 override CXXFLAGS += $(WARN_FLAGS) $(extra_cflags) $(extra_cxxflags)
@@ -28,6 +31,9 @@ include Makefile.config
 %.o: %.c
        $(CC) -c $(CFLAGS) $< -o $@
 
+%.elc: %.el
+       emacs -batch -f batch-byte-compile $<
+
 .deps/%.d: %.c
        @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
        $(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@.$$$$; \

diff --git a/Makefile.local b/Makefile.local
index c44d160378ea7f89f7f98f8dfff941aa825a00b9..ecd4ceb6d065c7c881a0e3d28804716e55ec2b86 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        \
@@ -25,15 +27,22 @@ notmuch.1.gz: notmuch.1
 
 install: all notmuch.1.gz
        for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man1 \
-               $(DESTDIR)/$(prefix)/share/emacs/site-lisp/ $(DESTDIR)/etc/bash_completion.d/ ; \
+               $(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
 
+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