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.

diff --git a/configure b/configure
index 21780a6149a1a2b33fc5bdced5f57798ae827524..959c65aa74f7402ad29b0a2ae94291313a85b22e 100755 (executable)
--- 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 1f6c4bbc01ee0082f8ccd92533c50e2cb0f6b53b..0c20c94469b4e75491ea4df94171f2116a4e7229 100755 (executable)
--- 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