Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 30B90431FBC for ; Thu, 19 Nov 2009 05:13:12 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3S3mZmet+ORs for ; Thu, 19 Nov 2009 05:13:11 -0800 (PST) Received: from mail-yx0-f204.google.com (mail-yx0-f204.google.com [209.85.210.204]) by olra.theworths.org (Postfix) with ESMTP id 364C4431FAE for ; Thu, 19 Nov 2009 05:13:11 -0800 (PST) Received: by yxe42 with SMTP id 42so2273393yxe.22 for ; Thu, 19 Nov 2009 05:13:10 -0800 (PST) Received: by 10.150.246.3 with SMTP id t3mr34648ybh.256.1258636389821; Thu, 19 Nov 2009 05:13:09 -0800 (PST) Received: from lt26923.campus.dmacc.edu ([69.57.47.215]) by mx.google.com with ESMTPS id 14sm281818gxk.2.2009.11.19.05.13.08 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 19 Nov 2009 05:13:08 -0800 (PST) Received: from localhost ([127.0.0.1] helo=localhost.localdomain) by lt26923.campus.dmacc.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1NB6ot-000220-4D; Thu, 19 Nov 2009 07:13:07 -0600 From: "Jeffrey C. Ollie" To: Not Much Mail Date: Thu, 19 Nov 2009 07:12:48 -0600 Message-Id: <1258636368-7778-1-git-send-email-jeff@ocjtech.us> X-Mailer: git-send-email 1.6.5.2 In-Reply-To: <1258628956-sup-8884@cannonball> References: <1258628956-sup-8884@cannonball> Subject: [notmuch] [PATCH] notmuch: improve installation of emacs mode X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Nov 2009 13:13:12 -0000 1) Add a separate install target to 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-start directory so that it gets loaded automatically. Signed-off-by: Jeffrey C. Ollie --- Makefile | 6 ++++++ Makefile.local | 13 ++++++++++--- 2 files changed, 16 insertions(+), 3 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 6bc01a5..e4a27e5 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 \ @@ -25,15 +25,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 notmuch.elc + for d in $(DESTDIR)/$(emacs_startdir) ; \ + do \ + install -d $$d ; \ + done ; + install -m0644 notmuch.el $(DESTDIR)$(emacs_startdir) + install -m0644 notmuch.elc $(DESTDIR)$(emacs_startdir) + SRCS := $(SRCS) $(notmuch_client_srcs) CLEAN := $(CLEAN) notmuch $(notmuch_client_modules) -- 1.6.5.2