[PATCH xkbcomp] man: replace default include directory with the one from configure

Peter Hutterer peter.hutterer at who-t.net
Sun Feb 2 13:31:36 PST 2014


Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 man/Makefile.am | 2 ++
 man/xkbcomp.man | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/man/Makefile.am b/man/Makefile.am
index f17336a..953e84c 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -8,5 +8,7 @@ CLEANFILES = $(appman_DATA)
 SUFFIXES = .$(APP_MAN_SUFFIX) .man
 
 # String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+MAN_SUBSTS += -e 's|__xkbconfigroot__|$(XKBCONFIGROOT)|'
+
 .man.$(APP_MAN_SUFFIX):
 	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/man/xkbcomp.man b/man/xkbcomp.man
index 667c985..47e516a 100644
--- a/man/xkbcomp.man
+++ b/man/xkbcomp.man
@@ -63,7 +63,7 @@ Show available options.
 Specifies top-level directories to be searched for files included by the
 keymap description.  After all directories specified by \-I options
 have been searched, the current directory and finally, the default
-xkb directory (usually __projectroot__/lib/X11/xkb) will be searched.
+xkb directory __xkbconfigroot__ will be searched.
 .sp
 To prevent the current and default directories from being searched,
 use the \-I option alone (i.e. without a directory), before any \-I
-- 
1.8.4.2



More information about the xorg-devel mailing list