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.

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