summaryrefslogtreecommitdiff
path: root/manpages.am
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2017-03-31 17:33:52 -0700
committerEric Anholt <eric@anholt.net>2017-04-25 15:01:23 -0700
commitda27ca84b4324b68037d6ec19a73b9e0a5ef10bc (patch)
tree75a86c77b547550bd2c515517fedc8b5e2662cce /manpages.am
parentf81343dd2fff49c70f53e3efdd40f8f89a38e460 (diff)
xorg: Change __XCONFIGFILE__ to XCONFIGFILE (and DIR) to fix scan.c.
parser/scan.c was checking for #ifdef XCONFIGFILE and XCONFIGDIR and defaulting to "xorg.conf", and "xorg.conf.d", so if you had changed __XCONFIGFILE__ to anything else, it would have got out of sync. Settle on the name without gratuitous underscores. Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'manpages.am')
-rw-r--r--manpages.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/manpages.am b/manpages.am
index 648210b4e..124bb5575 100644
--- a/manpages.am
+++ b/manpages.am
@@ -22,7 +22,7 @@ MAN_SUBSTS += -e 's|__logdir__|$(logdir)|g' \
-e 's|__datadir__|$(datadir)|g' \
-e 's|__mandir__|$(mandir)|g' \
-e 's|__sysconfdir__|$(sysconfdir)|g' \
- -e 's|__xconfigdir__|$(__XCONFIGDIR__)|g' \
+ -e 's|__xconfigdir__|$(XCONFIGDIR)|g' \
-e 's|__xkbdir__|$(XKB_BASE_DIRECTORY)|g' \
-e 's|__XKB_DFLT_RULES__|$(XKB_DFLT_RULES)|g' \
-e 's|__XKB_DFLT_MODEL__|$(XKB_DFLT_MODEL)|g' \