diff options
| author | marha <marha@users.sourceforge.net> | 2014-02-07 23:46:30 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-02-07 23:46:30 +0100 |
| commit | 6daf40f6b1138efad98dbb579cd35520cbc349bb (patch) | |
| tree | 7f45dbb347f5e1a73b18a720633b9d801c968490 /xkbcomp | |
| parent | 5c64f94cf4cf8457a5616fe20b9a27174895f1a8 (diff) | |
| parent | 982ac918afe6a1c02d5cf735d7b6c56443a048cc (diff) | |
| download | vcxsrv-6daf40f6b1138efad98dbb579cd35520cbc349bb.tar.gz vcxsrv-6daf40f6b1138efad98dbb579cd35520cbc349bb.tar.bz2 vcxsrv-6daf40f6b1138efad98dbb579cd35520cbc349bb.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa xserver git update 7 Feb 2014
Conflicts:
mesalib/src/glsl/glcpp/glcpp.c
openssl/Makefile
Diffstat (limited to 'xkbcomp')
| -rw-r--r-- | xkbcomp/man/Makefile.am | 2 | ||||
| -rw-r--r-- | xkbcomp/man/xkbcomp.man | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/xkbcomp/man/Makefile.am b/xkbcomp/man/Makefile.am index f17336a0f..953e84cbd 100644 --- a/xkbcomp/man/Makefile.am +++ b/xkbcomp/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/xkbcomp/man/xkbcomp.man b/xkbcomp/man/xkbcomp.man index 667c98506..47e516a76 100644 --- a/xkbcomp/man/xkbcomp.man +++ b/xkbcomp/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 |