X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=df1636d2f576a4031f9b2e8d6cec9e2846120410;hp=64038f87aededde4c44448fe9e303dbba151d97f;hb=7b1566db8a2ba682d9e2b7a83a1d8793f92295f3;hpb=ab95219a2fe3b7e3a019b98651e7cd7f36e411b3

diff --git a/configure b/configure
index 64038f87..df1636d2 100755
--- a/configure
+++ b/configure
@@ -282,6 +282,18 @@ EMACS = emacs --quick
 # Command to execute gzip from Makefiles
 gzip = gzip
 
+# Command to create a directory
+MKDIR = install -d
+
+# Command to install an executable
+INSTALL-BIN = install
+
+# Command to install a non-executable file (documentation, etc.)
+INSTALL-DATA = install -m0644
+
+# Command to create a symbolic link
+SYMLINK = ln -sf
+
 # Default FLAGS for C compiler (can be overridden by user such as "make CFLAGS=-g")
 CFLAGS = ${CFLAGS}
 
@@ -298,19 +310,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)