diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-05-11 10:16:29 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-05-11 10:16:29 -0700 |
| commit | 4da097462b0b899e1790fd5a5f5e8ec811623c3d (patch) | |
| tree | 836f72f037791c716028b1584219d9f002febaf3 | |
| parent | db17ca534037463051833eeaf6d09356c479565e (diff) | |
Bug 21675 xmodmap manpage states the wrong path to XKeysymDB
http://bugs.freedesktop.org/show_bug.cgi?id=21675
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | xmodmap.man | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 905e023..6d07e32 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,6 +53,8 @@ SED = sed XORGRELSTRING = @PACKAGE_STRING@ XORGMANNAME = X Version 11 +X11_DATADIR=$(datadir)/X11 # Where libX11 installs XKeysymDB + MAN_SUBSTS = \ -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ @@ -60,6 +62,7 @@ MAN_SUBSTS = \ -e 's|__xconfigfile__|xorg.conf|g' \ -e 's|__projectroot__|$(prefix)|g' \ -e 's|__apploaddir__|$(appdefaultdir)|' \ + -e 's|__X11datadir__|$(X11_DATADIR)|' \ -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ diff --git a/xmodmap.man b/xmodmap.man index 69b5f2d..5d52f79 100644 --- a/xmodmap.man +++ b/xmodmap.man @@ -141,7 +141,7 @@ The \fIKEYSYMNAME\fP on the left hand side is translated into matching keycodes used to perform the corresponding set of \fBkeycode\fP expressions. The list of keysym names may be found in the header file \fI<X11/keysymdef.h>\fP (without the \fIXK_\fP prefix) -or the keysym database \fI __projectroot__/lib/X11/XKeysymDB\fP. Note that +or the keysym database \fI __X11datadir__/XKeysymDB\fP. Note that if the same keysym is bound to multiple keys, the expression is executed for each matching keycode. .TP 8 |