Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 09C21431FD0 for ; Mon, 24 Oct 2011 11:35:07 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id i58H8Wi4NJdX for ; Mon, 24 Oct 2011 11:35:06 -0700 (PDT) Received: from mail-gy0-f181.google.com (mail-gy0-f181.google.com [209.85.160.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 7806E431FB6 for ; Mon, 24 Oct 2011 11:35:06 -0700 (PDT) Received: by gye5 with SMTP id 5so8645607gye.26 for ; Mon, 24 Oct 2011 11:35:06 -0700 (PDT) Received: by 10.223.76.24 with SMTP id a24mr35547744fak.31.1319481305603; Mon, 24 Oct 2011 11:35:05 -0700 (PDT) Received: from localhost (abse157.neoplus.adsl.tpnet.pl. [83.8.124.157]) by mx.google.com with ESMTPS id y8sm44013088faj.10.2011.10.24.11.35.01 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 24 Oct 2011 11:35:03 -0700 (PDT) From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= To: notmuch@notmuchmail.org Subject: [PATCH] Separate Emacs miscellaneous files directory from Emacs code directory. Date: Mon, 24 Oct 2011 20:34:58 +0200 Message-Id: <1319481298-2837-1-git-send-email-aidecoe@aidecoe.name> X-Mailer: git-send-email 1.7.7.1 Cc: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Oct 2011 18:35:07 -0000 --emacsetcdir was added, but it's set default to the same value as --emacslispdir for backward compatibility. --- configure | 14 ++++++++++++++ emacs/Makefile.local | 3 ++- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 3999ce8..37c0283 100755 --- a/configure +++ b/configure @@ -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,9 @@ sysconfdir = ${SYSCONFDIR:=\$(prefix)/etc} # The directory to which emacs lisp files should be installed emacslispdir=${EMACSLISPDIR} +# The directory to which emacs lisp 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 ce0c3f0..0c58b82 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) -- 1.7.7.1