summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2005-12-09 03:57:41 +0000
committerAdam Jackson <ajax@nwnk.net>2005-12-09 03:57:41 +0000
commit7fa2d11d85d43f42aa9c02f8d772c91d1b04df43 (patch)
tree8048cc4f8ed0868b1587d4ca93f6601cf7652973
parent26b41ff43959a07a778bc3d6e4db8da036f09de3 (diff)
Bug #4361: Define XF86CONFIGFILE properly so config file generation works
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1b0fc7888..adfbc5712 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-08 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ Bug #4361: Define XF86CONFIGFILE properly so config file generation
+ works.
+
2005-12-08 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 9cf9b276a..e0686ba86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1106,7 +1106,7 @@ if test "x$XORG" = xyes; then
AC_DEFINE(DRIVERS, {}, [Built-in output drivers (none)])
AC_DEFINE(IDRIVERS, {}, [Built-in input drivers (none)])
AC_DEFINE_DIR(__XCONFIGFILE__, XF86CONFIGFILE, [Name of configuration file])
- AC_DEFINE_DIR(XF86CONFIGFILE, CONFIGFILE, [Path to Xorg configuration file])
+ AC_DEFINE_DIR(XF86CONFIGFILE, XF86CONFIGFILE, [Name of configuration file])
AC_DEFINE_DIR(DEFAULT_MODULE_PATH, moduledir, [Default module search path])
AC_DEFINE_DIR(DEFAULT_LOGPREFIX, LOGPREFIX, [Default log location])
AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])