1 Return-Path: <cworth@cworth.org>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 0AA0E4196F0
\r
6 for <notmuch@notmuchmail.org>; Wed, 7 Apr 2010 10:12:15 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-2.89 tagged_above=-999 required=5
\r
12 tests=[ALL_TRUSTED=-1, BAYES_00=-1.9, T_MIME_NO_TEXT=0.01]
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id fFIAsLcyxwQr; Wed, 7 Apr 2010 10:12:14 -0700 (PDT)
\r
17 Received: from yoom.home.cworth.org (localhost [127.0.0.1])
\r
18 by olra.theworths.org (Postfix) with ESMTP id 29416431FC1;
\r
19 Wed, 7 Apr 2010 10:12:14 -0700 (PDT)
\r
20 Received: by yoom.home.cworth.org (Postfix, from userid 1000)
\r
21 id CC56A25400C; Wed, 7 Apr 2010 10:12:13 -0700 (PDT)
\r
22 From: Carl Worth <cworth@cworth.org>
\r
23 To: David Edmondson <dme@dme.org>, notmuch <notmuch@notmuchmail.org>
\r
24 Subject: Re: finding the emacs lisp after install
\r
25 In-Reply-To: <87sk77wkte.fsf@ut.hh.sledj.net>
\r
26 References: <87sk77wkte.fsf@ut.hh.sledj.net>
\r
27 Date: Wed, 07 Apr 2010 10:12:13 -0700
\r
28 Message-ID: <874ojn6vbm.fsf@yoom.home.cworth.org>
\r
30 Content-Type: multipart/signed; boundary="=-=-=";
\r
31 micalg=pgp-sha1; protocol="application/pgp-signature"
\r
32 X-BeenThere: notmuch@notmuchmail.org
\r
33 X-Mailman-Version: 2.1.13
\r
35 List-Id: "Use and development of the notmuch mail system."
\r
36 <notmuch.notmuchmail.org>
\r
37 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
38 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
39 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
40 List-Post: <mailto:notmuch@notmuchmail.org>
\r
41 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
42 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
43 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
44 X-List-Received-Date: Wed, 07 Apr 2010 17:12:15 -0000
\r
47 Content-Transfer-Encoding: quoted-printable
\r
49 On Wed, 07 Apr 2010 12:42:21 +0100, David Edmondson <dme@dme.org> wrote:
\r
50 > After this change...
\r
52 > > Install emacs lisp files into a notmuch sub-directory of site-lisp.
\r
54 > > Now that we have multiple emacs-lisp source files, it's just more
\r
55 > > polite this way.
\r
57 > ...how is emacs supposed to find these files? .../site-lisp/notmuch is
\r
58 > not in my load-path by default (Debian GNU Emacs 23.1.1).
\r
62 The Debian package goes through some magic (in
\r
63 /etc/emacs/site-start.d/50notmuch.el) to ensure that this directory is
\r
64 added to the load-path.
\r
66 Given that, I've just changed the default back to just install the files
\r
67 into ${prefix}/share/emacs/site-lisp and made the Debian packaging
\r
68 request ${prefix}/share/emacs/site-lisp/notmuch when it configures (see
\r
71 Thanks for the report,
\r
75 From=20a7a961c510a87dc8af2842decabcbc9ecb7c1139 Mon Sep 17 00:00:00 2001
\r
76 From: Carl Worth <cworth@cworth.org>
\r
77 Date: Wed, 7 Apr 2010 10:07:23 -0700
\r
78 Subject: [PATCH] Makefile: Install emacs code to site-lisp, not site-lisp/n=
\r
81 And just make the Debian packaging request site-lisp/notmuch like it
\r
82 wants. Otherwise, the installed files won't appear on the load-path
\r
83 so won't be found by emacs.
\r
85 configure | 6 +++---
\r
86 debian/rules | 3 +++
\r
87 2 files changed, 6 insertions(+), 3 deletions(-)
\r
89 diff --git a/configure b/configure
\r
90 index 21780a6..959c65a 100755
\r
93 @@ -71,7 +71,7 @@ Fine tuning of some installation directories is available:
\r
94 --includedir=3DDIR Install header files to DIR [PREFIX/include]
\r
95 --mandir=3DDIR Install man pages to DIR [PREFIX/share/man]
\r
96 --sysconfdir=3DDIR Read-only single-machine data [PREFIX/etc]
\r
97 =2D --emacslispdir=3DDIR Elisp [PREFIX/share/emacs/site-lisp/notmuch]
\r
98 + --emacslispdir=3DDIR Emacs code [PREFIX/share/emacs/site-lisp]
\r
100 Additional options are accepted for compatibility with other
\r
101 configure-script calling conventions, but don't do anything yet:
\r
102 @@ -219,9 +219,9 @@ fi
\r
104 if [ -z "${EMACSLISPDIR}" ]; then
\r
105 if pkg-config --modversion emacs > /dev/null 2>&1; then
\r
106 =2D EMACSLISPDIR=3D$(pkg-config emacs --variable sitepkglispdir)/notmuch
\r
107 + EMACSLISPDIR=3D$(pkg-config emacs --variable sitepkglispdir)
\r
109 =2D EMACSLISPDIR=3D'$(prefix)/share/emacs/site-lisp/notmuch'
\r
110 + EMACSLISPDIR=3D'$(prefix)/share/emacs/site-lisp'
\r
114 diff --git a/debian/rules b/debian/rules
\r
115 index 1f6c4bb..0c20c94 100755
\r
116 =2D-- a/debian/rules
\r
122 +override_dh_auto_configure:
\r
123 + dh_auto-configure --emacslispdir=3D/usr/share/emacs/site-lisp/notmuch
\r
125 override_dh_installdocs:
\r
127 install -m644 vim/README debian/notmuch/usr/share/doc/notmuch/README.vim
\r
133 Content-Type: application/pgp-signature
\r
135 -----BEGIN PGP SIGNATURE-----
\r
136 Version: GnuPG v1.4.10 (GNU/Linux)
\r
138 iD8DBQFLvLzt6JDdNq8qSWgRAukaAJ46LQZY+czGan+aUP04FjgYg1RMgwCgiPeK
\r
139 9QMu4fwJJLh4l0ZNqHfMKb8=
\r
141 -----END PGP SIGNATURE-----
\r