From 44cc0bdd27687ba3c198c8be94241ae4de9205e9 Mon Sep 17 00:00:00 2001 From: uu1101 Date: Sun, 1 Dec 2013 00:26:15 +0100 Subject: [PATCH] * mu4e/Makefile: allow configuring the lispdir `lispdir` is no longer hardcoded in the Makefile. Users can set the desired `lispdir` at configure time, with `./configure --with-lispdir='...'`; or at install time with `make lispdir='...' install`. The default install path is the folder `mu4e/` inside whatever AM_PATH_LISP finds, which is probably what the original default intended. This change fixes #320. --- configure.ac | 6 ++++-- mu4e/Makefile.am | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index d0ba81e5..2af1de23 100644 --- a/configure.ac +++ b/configure.ac @@ -60,8 +60,10 @@ AC_ARG_ENABLE([mu4e], AS_HELP_STRING([--disable-mu4e],[Disable building mu4e])) AS_IF([test "x$enable_mu4e" != "xno"], [ AM_PATH_LISPDIR - AS_IF([test "x$lispdir" != "xno"], - [emacs_version="`$EMACS --version | head -1`"]) + AS_IF([test "x$lispdir" != "xno"], [ + emacs_version="`$EMACS --version | head -1`" + lispdir="${lispdir}/mu4e/" + ]) AS_CASE([$emacs_version],[*23*|*24*|*25*],[build_mu4e=yes], [AC_WARN([emacs is too old to build mu4e (need emacs >= 23.x)])]) ]) diff --git a/mu4e/Makefile.am b/mu4e/Makefile.am index b82e4aea..4369b17a 100644 --- a/mu4e/Makefile.am +++ b/mu4e/Makefile.am @@ -21,8 +21,6 @@ SUBDIRS= info_TEXINFOS=mu4e.texi mu4e_TEXINFOS=fdl.texi -lispdir=${prefix}/share/emacs/site-lisp/mu4e/ - dist_lisp_LISP= \ mu4e-about.el \ mu4e-actions.el \