From 649b1609a166c4b176b5afb6e4053eb5a88a07d9 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Wed, 31 Mar 2010 22:41:02 -0700 Subject: [PATCH] Makefile.config: Avoid pre-expanding the ${prefix} variable. One of the supproted mechanisms we offer for configuration is manually editing the Makefile.config file after it is generated by the configure script. In this case it would be nice to be able to change prefix only once, so allow that. --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 64038f87..7db537e4 100755 --- a/configure +++ b/configure @@ -298,19 +298,19 @@ WARN_CFLAGS=\$(WARN_CXXFLAGS) -Wmissing-declarations prefix = ${PREFIX} # The directory to which notmuch libraries should be installed -libdir = ${LIBDIR:=$PREFIX/lib} +libdir = ${LIBDIR:=\$(prefix)/lib} # The directory to which emacs lisp files should be installed emacs_lispdir=${emacs_lispdir} # The directory to which desktop files should be installed -desktop_dir = \${prefix}/share/applications +desktop_dir = \$(prefix)/share/applications # The directory to which bash completions files should be installed bash_completion_dir = /etc/bash_completion.d # The directory to which zsh completions files should be installed -zsh_completion_dir = ${PREFIX}/share/zsh/functions/Completion/Unix +zsh_completion_dir = \$(prefix)/share/zsh/functions/Completion/Unix # Whether the getline function is available (if not, then notmuch will # build its own version)