Commit 18e2b6e4 authored by Iustin Pop's avatar Iustin Pop
Browse files

Remove last vestiges of docbook



This patch removes the last traces of docbook.
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarRené Nussbaumer <rn@google.com>
parent c2e818b6
...@@ -10,7 +10,6 @@ abs_top_builddir = @abs_top_builddir@ ...@@ -10,7 +10,6 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@ abs_top_srcdir = @abs_top_srcdir@
ACLOCAL_AMFLAGS = -I autotools ACLOCAL_AMFLAGS = -I autotools
DOCBOOK_WRAPPER = $(top_srcdir)/autotools/docbook-wrapper
BUILD_BASH_COMPLETION = $(top_srcdir)/autotools/build-bash-completion BUILD_BASH_COMPLETION = $(top_srcdir)/autotools/build-bash-completion
RUN_IN_TEMPDIR = $(top_srcdir)/autotools/run-in-tempdir RUN_IN_TEMPDIR = $(top_srcdir)/autotools/run-in-tempdir
CHECK_PYTHON_CODE = $(top_srcdir)/autotools/check-python-code CHECK_PYTHON_CODE = $(top_srcdir)/autotools/check-python-code
...@@ -336,7 +335,6 @@ EXTRA_DIST = \ ...@@ -336,7 +335,6 @@ EXTRA_DIST = \
autotools/check-python-code \ autotools/check-python-code \
autotools/check-man \ autotools/check-man \
autotools/check-tar \ autotools/check-tar \
autotools/docbook-wrapper \
autotools/gen-coverage \ autotools/gen-coverage \
autotools/testrunner \ autotools/testrunner \
$(RUN_IN_TEMPDIR) \ $(RUN_IN_TEMPDIR) \
......
#!/bin/sh
set -e
if test "$#" != 4
then
echo "Wrong number of arguments." >&2
exit 1
fi
cmd="${1}"
input="${2}"
cmdoutputfile="${3}"
output="${4}"
# docbook2man inserts a date formatted using the current locale into its
# output. Using the "C" locale makes sure it's always in the default format.
export LC_ALL=C
tmpdir=`mktemp -d`
trap "rm -rf ${tmpdir}" EXIT
if ! ( cd `dirname ${input}` &&
${cmd} -o ${tmpdir} `basename "${input}"` >/dev/null; )
then
echo "Building ${output} failed." >&2
exit 1
fi
mv "${tmpdir}/${cmdoutputfile}" "${output}"
# Needed for make to recognize output file
touch "${output}"
...@@ -227,21 +227,7 @@ AC_SUBST(SYSLOG_USAGE, $SYSLOG) ...@@ -227,21 +227,7 @@ AC_SUBST(SYSLOG_USAGE, $SYSLOG)
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_LN_S AC_PROG_LN_S
# Check for docbook programs # Check for pandoc
AC_ARG_VAR(DOCBOOK2MAN, [docbook2man path])
AC_PATH_PROG(DOCBOOK2MAN, [docbook2man], [])
if test -z "$DOCBOOK2MAN"
then
AC_MSG_WARN([docbook2man not found, man pages rebuild will not be possible])
fi
AC_ARG_VAR(DOCBOOK2HTML, [docbook2html path])
AC_PATH_PROG(DOCBOOK2HTML, [docbook2html], [])
if test -z "$DOCBOOK2HTML"
then
AC_MSG_WARN([docbook2html not found, man pages rebuild will not be possible])
fi
AC_ARG_VAR(PANDOC, [pandoc path]) AC_ARG_VAR(PANDOC, [pandoc path])
AC_PATH_PROG(PANDOC, [pandoc], []) AC_PATH_PROG(PANDOC, [pandoc], [])
if test -z "$PANDOC" if test -z "$PANDOC"
......
...@@ -9,8 +9,7 @@ Most dependencies from :doc:`install-quick`, plus: ...@@ -9,8 +9,7 @@ Most dependencies from :doc:`install-quick`, plus:
- `GNU make <http://www.gnu.org/software/make/>`_ - `GNU make <http://www.gnu.org/software/make/>`_
- `GNU tar <http://www.gnu.org/software/tar/>`_ - `GNU tar <http://www.gnu.org/software/tar/>`_
- `Gzip <http://www.gnu.org/software/gzip/>`_ - `Gzip <http://www.gnu.org/software/gzip/>`_
- `Docbook tools <http://sources.redhat.com/docbook-tools/>`_ - `pandoc <http://johnmacfarlane.net/pandoc/>`_
(docbook2html and docbook2man)
- `python-sphinx <http://sphinx.pocoo.org/>`_ - `python-sphinx <http://sphinx.pocoo.org/>`_
(tested with version 0.6.1) (tested with version 0.6.1)
- `graphviz <http://www.graphviz.org/>`_ - `graphviz <http://www.graphviz.org/>`_
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment