diff options
| author |  Jeffrey C. Ollie <jeff@ocjtech.us> | 2009-11-19 15:20:01 -0600 |
|---|---|---|
| committer |  Carl Worth <cworth@cworth.org> | 2009-11-20 10:34:29 +0100 |
| commit | d98718d10491207f933e100080d976f6762347bb (patch) | |
| tree | cffa1042d7792dc2e3b2dfd2c8ec3d3b6fbb2946 | |
| parent | 19d951ee166198e6c20a8850a5736b6453a2a91c (diff) | |
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>
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | Makefile.local | 15 |
3 files changed, 19 insertions, 4 deletions
@@ -7,4 +7,4 @@ notmuch.1.gz *.[ao] *~ .*.swp - +*.elc @@ -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 c44d1603..ecd4ceb6 100644 --- 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 |