aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/rules/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-09 09:27:21 +0200
committermarha <marha@users.sourceforge.net>2011-06-09 09:27:21 +0200
commit0de14292c4fac98f91105baf9cc16e58f25d4d77 (patch)
tree1704165c3d7f05bde08dc6d3d52ee33aed0f270f /xorg-server/xkeyboard-config/rules/Makefile.am
parent637bc31135b378ea9521b5a93b14bdce482da209 (diff)
parent0a9d2abef2e6fac5d52556969655a62711df6418 (diff)
downloadvcxsrv-0de14292c4fac98f91105baf9cc16e58f25d4d77.tar.gz
vcxsrv-0de14292c4fac98f91105baf9cc16e58f25d4d77.tar.bz2
vcxsrv-0de14292c4fac98f91105baf9cc16e58f25d4d77.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/include/GL/internal/dri_interface.h mesalib/src/gallium/auxiliary/util/u_math.h mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/gen/gl_table.py mesalib/src/mesa/SConscript mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/es_generator.py mesalib/src/mesa/main/imports.h mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_draw.c mesalib/src/mesa/state_tracker/st_program.c mesalib/src/mesa/vbo/vbo_save_api.c xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/Makefile.am xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/symbols/cz xorg-server/xkeyboard-config/symbols/in
Diffstat (limited to 'xorg-server/xkeyboard-config/rules/Makefile.am')
-rw-r--r--xorg-server/xkeyboard-config/rules/Makefile.am8
1 files changed, 8 insertions, 0 deletions
diff --git a/xorg-server/xkeyboard-config/rules/Makefile.am b/xorg-server/xkeyboard-config/rules/Makefile.am
index dcf9e3d90..e8b704cea 100644
--- a/xorg-server/xkeyboard-config/rules/Makefile.am
+++ b/xorg-server/xkeyboard-config/rules/Makefile.am
@@ -234,3 +234,11 @@ rulesdir = $(xkb_base)/rules
xmldir = $(rulesdir)
@INTLTOOL_XML_NOMERGE_RULE@
+
+xkeyboard-config.man: evdev.xml
+ $(XSLTPROC) $(top_srcdir)/xslt/man.xsl evdev.xml > $@
+
+xkeyboard-config.7: xkeyboard-config.man
+ $(SED) $(MAN_SUBSTS) < $< > $@
+
+dist_man_MANS = xkeyboard-config.7