diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-14 08:14:45 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-14 08:14:45 +0200 |
| commit | 6b441c10eeb02569204ff50ba8c3b739037b8141 (patch) | |
| tree | f9c0dd95a41268546aeecdd31c8588c617749cd1 /xorg-server/xkeyboard-config/man/Makefile.am | |
| parent | 0d495843cebea4ae94a3138db2bf51da80a16391 (diff) | |
| parent | 4d74e36f359d22b50302c82a922b79ac24dd3e23 (diff) | |
| download | vcxsrv-6b441c10eeb02569204ff50ba8c3b739037b8141.tar.gz vcxsrv-6b441c10eeb02569204ff50ba8c3b739037b8141.tar.bz2 vcxsrv-6b441c10eeb02569204ff50ba8c3b739037b8141.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/SConscript
mesalib/src/mesa/drivers/common/driverfuncs.c
mesalib/src/mesa/main/texgetimage.c
mesalib/src/mesa/sources.mak
mesalib/src/mesa/swrast/s_texrender.c
mesalib/src/mesa/vbo/vbo_exec_array.c
xorg-server/xkeyboard-config/configure.in
Diffstat (limited to 'xorg-server/xkeyboard-config/man/Makefile.am')
| -rw-r--r-- | xorg-server/xkeyboard-config/man/Makefile.am | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/xorg-server/xkeyboard-config/man/Makefile.am b/xorg-server/xkeyboard-config/man/Makefile.am new file mode 100644 index 000000000..2e9deaa48 --- /dev/null +++ b/xorg-server/xkeyboard-config/man/Makefile.am @@ -0,0 +1,17 @@ +EXTRA_DIST = man.xsl + +if HAVE_XSLTPROC +miscmandir = $(MISC_MAN_DIR) +miscman_PRE = xkeyboard-config.man +miscman_DATA = $(miscman_PRE:man=@MISC_MAN_SUFFIX@) +CLEANFILES = $(miscman_DATA) $(miscman_PRE) +SUFFIXES = .$(MISC_MAN_SUFFIX) .man +MAN_SUBSTS += -e 's|__xkb_base__|$(xkb_base)|g' + +xkeyboard-config.man: $(top_builddir)/rules/evdev.xml $(srcdir)/man.xsl + $(XSLTPROC) -nonet $(srcdir)/man.xsl $(top_builddir)/rules/evdev.xml > $@ + +.man.$(MISC_MAN_SUFFIX): + $(SED) $(MAN_SUBSTS) < $< > $@ + +endif |