1) Don't hardcode the installation directory, instead use emacs'
pkg-config module.
2) Install a byte compiled version of the emacs mode.
3) Install the emacs mode in emacs' site-start directory so that it
gets loaded automatically.
---
Makefile | 6 ++++++
Makefile.local | 9 +++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 023b2ec..17fa4a2 100644
--- 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 27e42ba..8aac201 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -1,4 +1,4 @@
-all: notmuch notmuch.1.gz
+all: notmuch notmuch.1.gz notmuch.elc
notmuch_client_srcs = \
notmuch.c \
@@ -23,15 +23,16 @@ notmuch: $(notmuch_client_modules) lib/notmuch.a
notmuch.1.gz: notmuch.1
gzip --stdout notmuch.1 > notmuch.1.gz
-install: all notmuch.1.gz
+install: all notmuch.1.gz notmuch.elc
for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man1 \
- $(DESTDIR)/etc/bash_completion.d/ ; \
+ $(DESTDIR)/etc/bash_completion.d/ $(DESTDIR)$(emacs_startdir) ;
\
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 -m0644 notmuch.el $(DESTDIR)$(emacs_startdir)
+ install -m0644 notmuch.elc $(DESTDIR)$(emacs_startdir)
install notmuch-completion.bash \
$(DESTDIR)/etc/bash_completion.d/notmuch
--
1.6.5.2
