unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
* finding the emacs lisp after install
@ 2010-04-07 11:42 David Edmondson
  2010-04-07 17:12 ` Carl Worth
  0 siblings, 1 reply; 2+ messages in thread
From: David Edmondson @ 2010-04-07 11:42 UTC (permalink / raw)
  To: notmuch

After this change...

> commit dfbec15b2388158693ab0dce0c7d348c4c5a98a5
> Author: Carl Worth <cworth@cworth.org>
> Date:   Tue Apr 6 15:05:13 2010 -0700
> 
>     Install emacs lisp files into a notmuch sub-directory of site-lisp.
>     
>     Now that we have multiple emacs-lisp source files, it's just more
>     polite this way.

...how is emacs supposed to find these files? .../site-lisp/notmuch is
not in my load-path by default (Debian GNU Emacs 23.1.1).

dme.
-- 
David Edmondson, http://dme.org

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: finding the emacs lisp after install
  2010-04-07 11:42 finding the emacs lisp after install David Edmondson
@ 2010-04-07 17:12 ` Carl Worth
  0 siblings, 0 replies; 2+ messages in thread
From: Carl Worth @ 2010-04-07 17:12 UTC (permalink / raw)
  To: David Edmondson, notmuch

[-- Attachment #1: Type: text/plain, Size: 2782 bytes --]

On Wed, 07 Apr 2010 12:42:21 +0100, David Edmondson <dme@dme.org> wrote:
> After this change...
>
> >     Install emacs lisp files into a notmuch sub-directory of site-lisp.
> >     
> >     Now that we have multiple emacs-lisp source files, it's just more
> >     polite this way.
> 
> ...how is emacs supposed to find these files? .../site-lisp/notmuch is
> not in my load-path by default (Debian GNU Emacs 23.1.1).

Ah, good point.

The Debian package goes through some magic (in
/etc/emacs/site-start.d/50notmuch.el) to ensure that this directory is
added to the load-path.

Given that, I've just changed the default back to just install the files
into ${prefix}/share/emacs/site-lisp and made the Debian packaging
request ${prefix}/share/emacs/site-lisp/notmuch when it configures (see
below).

Thanks for the report,

-Carl

From a7a961c510a87dc8af2842decabcbc9ecb7c1139 Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Wed, 7 Apr 2010 10:07:23 -0700
Subject: [PATCH] Makefile: Install emacs code to site-lisp, not site-lisp/notmuch

And just make the Debian packaging request site-lisp/notmuch like it
wants. Otherwise, the installed files won't appear on the load-path
so won't be found by emacs.
---
 configure    |    6 +++---
 debian/rules |    3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 21780a6..959c65a 100755
--- a/configure
+++ b/configure
@@ -71,7 +71,7 @@ Fine tuning of some installation directories is available:
 	--includedir=DIR	Install header files to DIR [PREFIX/include]
 	--mandir=DIR		Install man pages to DIR [PREFIX/share/man]
 	--sysconfdir=DIR	Read-only single-machine data [PREFIX/etc]
-	--emacslispdir=DIR	Elisp [PREFIX/share/emacs/site-lisp/notmuch]
+	--emacslispdir=DIR	Emacs code [PREFIX/share/emacs/site-lisp]
 
 Additional options are accepted for compatibility with other
 configure-script calling conventions, but don't do anything yet:
@@ -219,9 +219,9 @@ fi
 
 if [ -z "${EMACSLISPDIR}" ]; then
     if pkg-config --modversion emacs > /dev/null 2>&1; then
-	EMACSLISPDIR=$(pkg-config emacs --variable sitepkglispdir)/notmuch
+	EMACSLISPDIR=$(pkg-config emacs --variable sitepkglispdir)
     else
-	EMACSLISPDIR='$(prefix)/share/emacs/site-lisp/notmuch'
+	EMACSLISPDIR='$(prefix)/share/emacs/site-lisp'
     fi
 fi
 
diff --git a/debian/rules b/debian/rules
index 1f6c4bb..0c20c94 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,9 @@
 %:
 	dh $@
 
+override_dh_auto_configure:
+	dh_auto-configure --emacslispdir=/usr/share/emacs/site-lisp/notmuch
+
 override_dh_installdocs:
 	dh_installdocs
 	install -m644 vim/README debian/notmuch/usr/share/doc/notmuch/README.vim
-- 
1.7.0


[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-04-07 17:12 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-07 11:42 finding the emacs lisp after install David Edmondson
2010-04-07 17:12 ` Carl Worth

Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).