Skip to content

Commit

Permalink
Revert "Use XSL to generate man page from the rules XML"
Browse files Browse the repository at this point in the history
This reverts commit 35dc61a.
  • Loading branch information
Sergey V. Udaltsov committed Jun 9, 2011
1 parent 35dc61a commit bff3916
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 128 deletions.
14 changes: 0 additions & 14 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@ AC_CONFIG_SRCDIR(rules/base.xml.in)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE

# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before
running autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
XORG_MANPAGE_SECTIONS

AC_SUBST(VERSION)

AC_PATH_PROG([XKBCOMP], [xkbcomp], [not_found])
Expand All @@ -31,13 +24,6 @@ AC_ARG_ENABLE( compat_rules,
enable_compat_rules="$enableval",
enable_compat_rules="yes" )

AC_PATH_PROG(SED, [sed])
AC_PATH_PROG(XSLTPROC, [xsltproc])
AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"])
if test "x$XSLTPROC" = "x"; then
AC_MSG_WARN([xsltproc not found, needed to generate man page.])
fi

# xkeyboard-config does not have build-time dependencies. However, it does
# have run-time dependencies and keyboard layouts may not work without the
# right libX11 or xproto installed.
Expand Down
8 changes: 0 additions & 8 deletions rules/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -234,11 +234,3 @@ 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
106 changes: 0 additions & 106 deletions xslt/man.xsl

This file was deleted.

0 comments on commit bff3916

Please sign in to comment.