diff options
| author | Kevin E Martin <kem@kem.org> | 2005-12-10 16:29:39 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-12-10 16:29:39 +0000 |
| commit | c6ac2005b95ed188821fd877b467d85e1e2019e8 (patch) | |
| tree | 30f5924df896a7fab9d9053acc6f1b65431a7505 | |
| parent | cb6a93f506301182dd654618167a7c41bd53c410 (diff) | |
Add configure option to set config install dir.MODULAR_COPY
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 9 |
3 files changed, 16 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2005-12-10 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * Makefile.am: + * configure.ac: + Add configure option to set config install dir. + 2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/Makefile.am b/Makefile.am index 80d55ed..9d98fa3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -130,7 +130,7 @@ CFFILES = \ xfree86.cf \ xorg.cf -configdir = $(libdir)/X11/config +configdir = @XCONFDIR@ dist_config_DATA = $(RULEFILES) $(TMPLFILES) $(DEFFILES) $(CFFILES) config_DATA = $(BUILT_DEFFILES) diff --git a/configure.ac b/configure.ac index 5308128..64e0c30 100644 --- a/configure.ac +++ b/configure.ac @@ -3,6 +3,15 @@ AC_INIT(xorg-cf-files, [0.99.3], [https://bugs.freedesktop.org/enter_bug.cgi?pro AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) + +DEFAULT_XCONFDIR="${libdir}/X11/config" +AC_ARG_WITH(config-dir, + AS_HELP_STRING([--with-config-dir=<path>], [Path to config dir (default: ${libdir}/X11/config)]), + [XCONFDIR="$withval"], + [XCONFDIR="$DEFAULT_XCONFDIR"]) +AC_SUBST(XCONFDIR) + XORG_RELEASE_VERSION AC_OUTPUT([ |