debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 12:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Install emacs lisp files into a notmuch sub-directory of site-lisp.

Browse source 
Now that we have multiple emacs-lisp source files, it's just more
polite this way.
This commit is contained in:
Carl Worth 2010-04-06 15:05:13 -07:00
parent 53fa1ed0a8
commit dfbec15b23
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
configure vendored
View file

@ -71,6 +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]
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:
@ -100,6 +101,8 @@ for option; do
MANDIR="${option#*=}" MANDIR="${option#*=}"
elif [ "${option%%=*}" = '--sysconfdir' ] ; then elif [ "${option%%=*}" = '--sysconfdir' ] ; then
SYSCONFDIR="${option#*=}" SYSCONFDIR="${option#*=}"
elif [ "${option%%=*}" = '--emacslispdir' ] ; then
EMACSLISPDIR="${option#*=}"
elif [ "${option%%=*}" = '--build' ] ; then elif [ "${option%%=*}" = '--build' ] ; then
build_option="${option#*=}" build_option="${option#*=}"
case ${build_option} in case ${build_option} in
@ -214,10 +217,12 @@ else
have_valgrind=0 have_valgrind=0
fi fi
if pkg-config --modversion emacs > /dev/null 2>&1; then if [ -z "${EMACSLISPDIR}" ]; then
emacs_lispdir=$(pkg-config emacs --variable sitepkglispdir) if pkg-config --modversion emacs > /dev/null 2>&1; then
else EMACSLISPDIR=$(pkg-config emacs --variable sitepkglispdir)/notmuch
emacs_lispdir='$(prefix)/share/emacs/site-lisp' else
EMACSLISPDIR='$(prefix)/share/emacs/site-lisp/notmuch'
fi
fi fi
printf "Checking if emacs is available... " printf "Checking if emacs is available... "
@ -361,7 +366,7 @@ mandir = ${MANDIR:=\$(prefix)/share/man}
sysconfdir = ${SYSCONFDIR:=\$(prefix)/etc} sysconfdir = ${SYSCONFDIR:=\$(prefix)/etc}
# The directory to which emacs lisp files should be installed # The directory to which emacs lisp files should be installed
emacs_lispdir=${emacs_lispdir} emacslispdir=${EMACSLISPDIR}
# Whether there's an emacs binary available for byte-compiling # Whether there's an emacs binary available for byte-compiling
HAVE_EMACS = ${have_emacs} HAVE_EMACS = ${have_emacs}

1
debian/notmuch.install vendored
View file

@ -1 +0,0 @@
notmuch.el usr/share/emacs/site-lisp/notmuch

6
emacs/Makefile.local
View file

@ -20,10 +20,10 @@ install: install-emacs
.PHONY: install-emacs .PHONY: install-emacs
install-emacs: install-emacs:
mkdir -p $(DESTDIR)/$(emacs_lispdir) mkdir -p $(DESTDIR)$(emacslispdir)
install -m0644 $(emacs_sources) $(DESTDIR)$(emacs_lispdir) install -m0644 $(emacs_sources) $(DESTDIR)$(emacslispdir)
ifeq ($(HAVE_EMACS),1) ifeq ($(HAVE_EMACS),1)
install -m0644 $(emacs_bytecode) $(DESTDIR)$(emacs_lispdir) install -m0644 $(emacs_bytecode) $(DESTDIR)$(emacslispdir)
endif endif
CLEAN := $(CLEAN) $(emacs_bytecode) CLEAN := $(CLEAN) $(emacs_bytecode)