diff options
| author | Julien Cristau <jcristau@debian.org> | 2008-02-05 21:57:21 +0100 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2008-02-05 21:58:38 +0100 |
| commit | f253f56e9ff33e7424317be7fa54a60eec4053a8 (patch) | |
| tree | 6fa0da4493db240d9634348b04416963e40d20c8 | |
| parent | 71c2acc3d0fecc5c6c3d63cfae8f38ee2ce72d9d (diff) | |
Install config file in $(sysconfdir) by default instead of $(libdir)
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 8433d61..27c3742 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -configdir = $(libdir)/X11/fs +configdir = $(sysconfdir)/X11/fs bin_PROGRAMS = xfs diff --git a/configure.ac b/configure.ac index a5ac20a..1ef1394 100644 --- a/configure.ac +++ b/configure.ac @@ -49,8 +49,8 @@ AC_CHECK_HEADERS([stdint.h]) AC_ARG_WITH(default-config-file, AS_HELP_STRING([--with-default-config-file=PATH], - [comma-separated list of paths to look for config file when not specified (default: ${libdir}/X11/fs/config)]), - [CONFIG_FILE="$withval"], [CONFIG_FILE="${libdir}/X11/fs/config"]) + [comma-separated list of paths to look for config file when not specified (default: ${sysconfdir}/X11/fs/config)]), + [CONFIG_FILE="$withval"], [CONFIG_FILE="${sysconfdir}/X11/fs/config"]) DEFAULT_CONFIG_FILE=`echo ${CONFIG_FILE} | sed 's/,/\\\\\\\\\\\",\\\\\\\\\\\"/'` AC_DEFINE_DIR([DEFAULT_CONFIG_FILE], DEFAULT_CONFIG_FILE, |