diff options
| author | marha <marha@users.sourceforge.net> | 2014-02-07 23:28:38 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-02-07 23:38:15 +0100 |
| commit | 982ac918afe6a1c02d5cf735d7b6c56443a048cc (patch) | |
| tree | e737eb3f7bb18d933e14f0967c1c1aa5ce5e06f6 /xkbcomp | |
| parent | 30af30b78075159fce477ae99cc72540133714d0 (diff) | |
| download | vcxsrv-982ac918afe6a1c02d5cf735d7b6c56443a048cc.tar.gz vcxsrv-982ac918afe6a1c02d5cf735d7b6c56443a048cc.tar.bz2 vcxsrv-982ac918afe6a1c02d5cf735d7b6c56443a048cc.zip | |
xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa xserver git update 7 Feb 2014
Update to openssl1.0.1f
xserver commit 83e38eb73fd8c852513aac2da2975b4c01070ec2
libxcb commit d7eb0bdf3b5b11ee9f40ee5e73df8fc0bdfa59f3
xkeyboard-config commit 7596672b96315465df8d8d691e3a567a52f70743
libX11 commit aacf95dacc7c598e7297894580d4d655593813b2
xkbcomp commit 31b90ee4ffc774e0da540277907fc5540c0b012c
libxtrans commit 3f0de269abe59353acbd7a5587d68ce0da91db67
fontconfig commit e310d2fac2d874d5aa76c609df70cc7b871c0b6d
mesa commit dd2229d4c68ed78a50104637aef904f8ab6d7dd3
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 |