mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-12-22 09:24:54 +01:00
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.
This commit is contained in:
parent
8d4fa40bec
commit
a7a961c510
2 changed files with 6 additions and 3 deletions
6
configure
vendored
6
configure
vendored
|
@ -71,7 +71,7 @@ Fine tuning of some installation directories is available:
|
||||||
--includedir=DIR Install header files to DIR [PREFIX/include]
|
--includedir=DIR Install header files to DIR [PREFIX/include]
|
||||||
--mandir=DIR Install man pages to DIR [PREFIX/share/man]
|
--mandir=DIR Install man pages to DIR [PREFIX/share/man]
|
||||||
--sysconfdir=DIR Read-only single-machine data [PREFIX/etc]
|
--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
|
Additional options are accepted for compatibility with other
|
||||||
configure-script calling conventions, but don't do anything yet:
|
configure-script calling conventions, but don't do anything yet:
|
||||||
|
@ -219,9 +219,9 @@ fi
|
||||||
|
|
||||||
if [ -z "${EMACSLISPDIR}" ]; then
|
if [ -z "${EMACSLISPDIR}" ]; then
|
||||||
if pkg-config --modversion emacs > /dev/null 2>&1; 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
|
else
|
||||||
EMACSLISPDIR='$(prefix)/share/emacs/site-lisp/notmuch'
|
EMACSLISPDIR='$(prefix)/share/emacs/site-lisp'
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
3
debian/rules
vendored
3
debian/rules
vendored
|
@ -2,6 +2,9 @@
|
||||||
%:
|
%:
|
||||||
dh $@
|
dh $@
|
||||||
|
|
||||||
|
override_dh_auto_configure:
|
||||||
|
dh_auto-configure --emacslispdir=/usr/share/emacs/site-lisp/notmuch
|
||||||
|
|
||||||
override_dh_installdocs:
|
override_dh_installdocs:
|
||||||
dh_installdocs
|
dh_installdocs
|
||||||
install -m644 vim/README debian/notmuch/usr/share/doc/notmuch/README.vim
|
install -m644 vim/README debian/notmuch/usr/share/doc/notmuch/README.vim
|
||||||
|
|
Loading…
Reference in a new issue