Bug 21675 - x11-apps/xmodmap manpage states the wrong path to XKeysymDB
Summary: x11-apps/xmodmap manpage states the wrong path to XKeysymDB
Status: RESOLVED FIXED
Alias: None
Product: xorg
Classification: Unclassified
Component: Documentation (show other bugs)
Version: 7.4 (2008.09)
Hardware: All All
: medium minor
Assignee: Xorg Project Team
QA Contact: Xorg Project Team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-05-11 06:20 UTC by Markus Rennings
Modified: 2009-05-11 10:19 UTC (History)
1 user (show)

See Also:
i915 platform:
i915 features:


Attachments

Description Markus Rennings 2009-05-11 06:20:02 UTC
The manpage of xmodmap states the path to XKeysymDB as 
  /usr/lib/X11/XKeysymDB
but in fact it is installed in
  /usr/share/X11/XKeysymD


(see also http://bugs.gentoo.org/show_bug.cgi?id=210003 )
Comment 1 Alan Coopersmith 2009-05-11 10:19:23 UTC
Thanks for the report.   Fix pushed to git master:

commit 4da097462b0b899e1790fd5a5f5e8ec811623c3d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Mon May 11 10:16:29 2009 -0700

    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>

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 int
 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


Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.