X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=fcaa373faa2c5a02f19a0279872a79e5a323974e;hp=b1e5f7850135227989833e8731ed62950323bd1d;hb=a597c8b6ca7140e2a54b71eba86ea14d491582f9;hpb=1d1ad74db9b85804fdec7e3311223caa7a591c82

diff --git a/configure b/configure
index b1e5f785..fcaa373f 100755
--- a/configure
+++ b/configure
@@ -70,11 +70,17 @@ Fine tuning of some installation directories is available:
 	--libdir=DIR		Install libraries to DIR [PREFIX/lib]
 	--includedir=DIR	Install header files to DIR [PREFIX/include]
 	--mandir=DIR		Install man pages to DIR [PREFIX/share/man]
+	--sysconfdir=DIR	Read-only single-machine data [PREFIX/etc]
 
 Additional options are accepted for compatibility with other
 configure-script calling conventions, but don't do anything yet:
 
 	--build=<cpu>-<vendor>-<os>	Currently ignored
+	--infodir=DIR			Currently ignored
+	--localstatedir=DIR		Currently ignored
+	--libexecdir=DIR		Currently ignored
+	--disable-maintainer-mode	Currently ignored
+	--disable-dependency-tracking	Currently ignored
 
 EOF
 }
@@ -92,6 +98,8 @@ for option; do
 	INCLUDEDIR="${option#*=}"
     elif [ "${option%%=*}" = '--mandir' ] ; then
 	MANDIR="${option#*=}"
+    elif [ "${option%%=*}" = '--sysconfdir' ] ; then
+	SYSCONFDIR="${option#*=}"
     elif [ "${option%%=*}" = '--build' ] ; then
 	build_option="${option#*=}"
 	case ${build_option} in
@@ -108,6 +116,16 @@ for option; do
 	build_option=${build_option#*-}
 	build_vendor=${build_option%%-*}
 	build_os=${build_option#*-}
+    elif [ "${option%%=*}" = '--infodir' ] ; then
+	true
+    elif [ "${option%%=*}" = '--localstatedir' ] ; then
+	true
+    elif [ "${option%%=*}" = '--libexecdir' ] ; then
+	true
+    elif [ "${option}" = '--disable-maintainer-mode' ] ; then
+	true
+    elif [ "${option}" = '--disable-dependency-tracking' ] ; then
+	true
     else
 	echo "Unrecognized option: ${option}"
 	echo "See:"
@@ -339,6 +357,9 @@ includedir = ${INCLUDEDIR:=\$(prefix)/lib}
 # The directory to which man pages should be installed
 mandir = ${MANDIR:=\$(prefix)/share/man}
 
+# The directory to which read-only (configuration) filesshould be installed
+sysconfdir = ${SYSCONFDIR:=\$(prefix)/etc}
+
 # The directory to which emacs lisp files should be installed
 emacs_lispdir=${emacs_lispdir}
 
@@ -349,7 +370,7 @@ HAVE_EMACS = ${have_emacs}
 desktop_dir = \$(prefix)/share/applications
 
 # The directory to which bash completions files should be installed
-bash_completion_dir = /etc/bash_completion.d
+bash_completion_dir = \$(sysconfdir)/bash_completion.d
 
 # The directory to which zsh completions files should be installed
 zsh_completion_dir = \$(prefix)/share/zsh/functions/Completion/Unix