summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2014-04-03 10:44:28 -0700
committerKeith Packard <keithp@keithp.com>2014-04-03 10:44:28 -0700
commit84f977467b514af88019ab2791bf7a74530b54df (patch)
tree8241ec207cd077a027ac1d73341daf4311657dd7 /include
parent9d20d18fb9dcc74bfa5392a2da40fd41b3e640d3 (diff)
parent98924719d524bf87cdf301063cd744d1271c33ff (diff)
Merge remote-tracking branch 'whot/for-keith'
Diffstat (limited to 'include')
-rw-r--r--include/xorg-config.h.in11
-rw-r--r--include/xwin-config.h.in3
2 files changed, 10 insertions, 4 deletions
diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
index 77a1aae55..629ae4057 100644
--- a/include/xorg-config.h.in
+++ b/include/xorg-config.h.in
@@ -45,9 +45,18 @@
/* Path to installed libraries. */
#undef DEFAULT_LIBRARY_PATH
-/* Path to server log file. */
+/* Default log location */
+#undef DEFAULT_LOGDIR
+
+/* Default logfile prefix */
#undef DEFAULT_LOGPREFIX
+/* Default XDG_DATA dir under HOME */
+#undef DEFAULT_XDG_DATA_HOME
+
+/* Default log dir under XDG_DATA_HOME */
+#undef DEFAULT_XDG_DATA_HOME_LOGDIR
+
/* Building DRI-capable DDX. */
#undef XF86DRI
diff --git a/include/xwin-config.h.in b/include/xwin-config.h.in
index 176c01980..a5e6b17b3 100644
--- a/include/xwin-config.h.in
+++ b/include/xwin-config.h.in
@@ -26,8 +26,5 @@
/* Vendor web address for support */
#undef __VENDORDWEBSUPPORT__
-/* Default log location */
-#undef DEFAULT_LOGDIR
-
/* Whether we should re-locate the root to where the executable lives */
#undef RELOCATE_PROJECTROOT