debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve installation of emacs mode.

Browse source 
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>
This commit is contained in:
Jeffrey C. Ollie 2009-11-19 15:20:01 -06:00 committed by Carl Worth
parent 19d951ee16
commit d98718d104
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -7,4 +7,4 @@ notmuch.1.gz
*.[ao] *.[ao]
*~ *~
.*.swp .*.swp
*.elc

6
Makefile
View file

@ -7,6 +7,9 @@ CFLAGS=-O2
extra_cflags := $(shell pkg-config --cflags glib-2.0 gmime-2.4 talloc) extra_cflags := $(shell pkg-config --cflags glib-2.0 gmime-2.4 talloc)
extra_cxxflags := $(shell xapian-config --cxxflags) 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 # Now smash together user's values with our extra values
override CFLAGS += $(WARN_FLAGS) $(extra_cflags) override CFLAGS += $(WARN_FLAGS) $(extra_cflags)
override CXXFLAGS += $(WARN_FLAGS) $(extra_cflags) $(extra_cxxflags) override CXXFLAGS += $(WARN_FLAGS) $(extra_cflags) $(extra_cxxflags)
@ -28,6 +31,9 @@ include Makefile.config
%.o: %.c %.o: %.c
$(CC) -c $(CFLAGS) $< -o $@ $(CC) -c $(CFLAGS) $< -o $@
%.elc: %.el
emacs -batch -f batch-byte-compile $<
.deps/%.d: %.c .deps/%.d: %.c
@set -e; rm -f $@; mkdir -p $$(dirname $@) ; \ @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
$(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@.$$$$; \ $(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@.$$$$; \

15
Makefile.local
View file

@ -1,5 +1,7 @@
all: notmuch notmuch.1.gz all: notmuch notmuch.1.gz
emacs: notmuch.elc
notmuch_client_srcs = \ notmuch_client_srcs = \
notmuch.c \ notmuch.c \
notmuch-config.c \ notmuch-config.c \
@ -25,15 +27,22 @@ notmuch.1.gz: notmuch.1
install: all notmuch.1.gz install: all notmuch.1.gz
for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man1 \ 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 \ do \
install -d $$d ; \ install -d $$d ; \
done ; done ;
install notmuch $(DESTDIR)$(prefix)/bin/ install notmuch $(DESTDIR)$(prefix)/bin/
install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/ install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/
install -m0644 notmuch.el $(DESTDIR)$(prefix)/share/emacs/site-lisp/
install notmuch-completion.bash \ install notmuch-completion.bash \
$(DESTDIR)/etc/bash_completion.d/notmuch $(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) SRCS := $(SRCS) $(notmuch_client_srcs)
CLEAN := $(CLEAN) notmuch $(notmuch_client_modules) CLEAN := $(CLEAN) notmuch $(notmuch_client_modules) notmuch.elc