summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2010-03-31 22:41:02 -0700
committerCarl Worth <cworth@cworth.org>2010-03-31 22:54:15 -0700
commit649b1609a166c4b176b5afb6e4053eb5a88a07d9 (patch)
treef401bbfc82c17e5d3cf50471e90e4ec69a375f1f
parentab95219a2fe3b7e3a019b98651e7cd7f36e411b3 (diff)
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.
-rwxr-xr-xconfigure6
1 files changed, 3 insertions, 3 deletions
diff --git a/configure b/configure
index 64038f8..7db537e 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)