diff options
| author |  Amadeusz Żołnowski <aidecoe@aidecoe.name> | 2011-10-25 10:07:02 +0200 |
|---|---|---|
| committer |  David Bremner <bremner@debian.org> | 2011-10-28 14:07:44 -0300 |
| commit | e6d85fb97d86e103c2c62cd215f54a3fe37856d0 (patch) | |
| tree | 644d3ce519e5a6c88bd2dba1399f400caa08ba4e | |
| parent | 8d282adf53148469c3d6a9d41346919aa70028af (diff) | |
Separate Emacs misc. files dir. from Emacs code dir.
New option --emacsetcdir was added, but it's set default to the same
value as --emacslispdir for backward compatibility.
| -rwxr-xr-x | configure | 15 | ||||
| -rw-r--r-- | emacs/Makefile.local | 3 |
2 files changed, 17 insertions, 1 deletions
@@ -97,6 +97,7 @@ Fine tuning of some installation directories is available: --mandir=DIR Install man pages to DIR [PREFIX/share/man] --sysconfdir=DIR Read-only single-machine data [PREFIX/etc] --emacslispdir=DIR Emacs code [PREFIX/share/emacs/site-lisp] + --emacsetcdir=DIR Emacs miscellaneous files [PREFIX/share/emacs/site-lisp] --bashcompletiondir=DIR Bash completions files [SYSCONFDIR/bash_completion.d] --zshcompletiondir=DIR Zsh completions files [PREFIX/share/zsh/functions/Completion/Unix] @@ -139,6 +140,8 @@ for option; do SYSCONFDIR="${option#*=}" elif [ "${option%%=*}" = '--emacslispdir' ] ; then EMACSLISPDIR="${option#*=}" + elif [ "${option%%=*}" = '--emacsetcdir' ] ; then + EMACSETCDIR="${option#*=}" elif [ "${option%%=*}" = '--bashcompletiondir' ] ; then BASHCOMPLETIONDIR="${option#*=}" elif [ "${option%%=*}" = '--zshcompletiondir' ] ; then @@ -330,6 +333,14 @@ if [ -z "${EMACSLISPDIR}" ]; then fi fi +if [ -z "${EMACSETCDIR}" ]; then + if pkg-config --exists emacs; then + EMACSETCDIR=$(pkg-config emacs --variable sitepkglispdir) + else + EMACSETCDIR='$(prefix)/share/emacs/site-lisp' + fi +fi + printf "Checking if emacs is available... " if emacs --quick --batch > /dev/null 2>&1; then printf "Yes.\n" @@ -614,6 +625,10 @@ sysconfdir = ${SYSCONFDIR:=\$(prefix)/etc} # The directory to which emacs lisp files should be installed emacslispdir=${EMACSLISPDIR} +# The directory to which emacs miscellaneous (machine-independent) files should +# be installed +emacsetcdir=${EMACSETCDIR} + # Whether there's an emacs binary available for byte-compiling HAVE_EMACS = ${have_emacs} diff --git a/emacs/Makefile.local b/emacs/Makefile.local index ce0c3f00..0c58b824 100644 --- a/emacs/Makefile.local +++ b/emacs/Makefile.local @@ -38,6 +38,7 @@ install-emacs: ifeq ($(HAVE_EMACS),1) install -m0644 $(emacs_bytecode) "$(DESTDIR)$(emacslispdir)" endif - install -m0644 $(emacs_images) "$(DESTDIR)$(emacslispdir)" + mkdir -p "$(DESTDIR)$(emacsetcdir)" + install -m0644 $(emacs_images) "$(DESTDIR)$(emacsetcdir)" CLEAN := $(CLEAN) $(emacs_bytecode) |