From: Dwight Engen Date: Mon, 29 Apr 2013 20:47:35 +0000 (-0400) Subject: fix building docs X-Git-Tag: lxc-1.0.0.alpha1~1^2~256 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f95145833bb24f54e037f73ecc37444d6635697;p=thirdparty%2Flxc.git fix building docs Commit 69fe23ff added checking for the older docbook2man back into configure, but this breaks building the docs on at least Oracle Linux and Fedora when docbook2X is not installed as docbook2man will be found but the docs don't actually build with that tool. This change makes it so the docs can be built with either the older docbook2man or the newer 2X tools by using configure to set the dtd string to an appropriate value depending on use of docbook2man or db2x_docbook2man. Also fixed a small error in lxc-destroy.sgml.in that was noticed by the old tools. Signed-off-by: Dwight Engen Signed-off-by: Serge Hallyn --- diff --git a/configure.ac b/configure.ac index 9b58bab38..eba19db7f 100644 --- a/configure.ac +++ b/configure.ac @@ -60,17 +60,12 @@ AM_CONDITIONAL([ENABLE_RPATH], [test "x$enable_rpath" = "xyes"]) # Documentation (manpages) AC_ARG_ENABLE([doc], - [AC_HELP_STRING([--enable-doc], [make mans (require docbook2x-man installed) [default=auto]])], + [AC_HELP_STRING([--enable-doc], [make mans (requires docbook2man or docbook2x-man to be installed) [default=auto]])], [], [enable_doc=auto]) if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then db2xman="" - - if test "x$with_distro" = "xdebian" -o "x$with_distro" = "xubuntu"; then - dbparsers="docbook2x-man db2x_docbook2man" - else - dbparsers="docbook2x-man db2x_docbook2man docbook2man" - fi + dbparsers="docbook2x-man db2x_docbook2man docbook2man" AC_MSG_CHECKING(for docbook2x-man) for name in ${dbparsers}; do @@ -93,6 +88,13 @@ if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then fi AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$db2xman" != "x"]) +if test "x$db2xman" = "xdocbook2man"; then + docdtd="\"-//Davenport//DTD DocBook V3.0//EN\"" +else + docdtd="\"-//OASIS//DTD DocBook XML\" \"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\"" +fi +AC_SUBST(docdtd) + # Apparmor AC_ARG_ENABLE([apparmor], [AC_HELP_STRING([--enable-apparmor], [enable apparmor])], diff --git a/doc/legacy/lxc-ls.sgml.in b/doc/legacy/lxc-ls.sgml.in index 60c085cdc..321e0878e 100644 --- a/doc/legacy/lxc-ls.sgml.in +++ b/doc/legacy/lxc-ls.sgml.in @@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - ]> diff --git a/doc/lxc-attach.sgml.in b/doc/lxc-attach.sgml.in index a3bdb4499..5c8d51337 100644 --- a/doc/lxc-attach.sgml.in +++ b/doc/lxc-attach.sgml.in @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - diff --git a/doc/lxc-cgroup.sgml.in b/doc/lxc-cgroup.sgml.in index 5dcd61962..888db369b 100644 --- a/doc/lxc-cgroup.sgml.in +++ b/doc/lxc-cgroup.sgml.in @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - diff --git a/doc/lxc-checkconfig.sgml.in b/doc/lxc-checkconfig.sgml.in index ec7a4c1b2..aa0241783 100644 --- a/doc/lxc-checkconfig.sgml.in +++ b/doc/lxc-checkconfig.sgml.in @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - ]> diff --git a/doc/lxc-checkpoint.sgml.in b/doc/lxc-checkpoint.sgml.in index 6cd7169f7..5737320ce 100644 --- a/doc/lxc-checkpoint.sgml.in +++ b/doc/lxc-checkpoint.sgml.in @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - diff --git a/doc/lxc-clone.sgml.in b/doc/lxc-clone.sgml.in index d00b57b01..994f3cddb 100644 --- a/doc/lxc-clone.sgml.in +++ b/doc/lxc-clone.sgml.in @@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - diff --git a/doc/lxc-console.sgml.in b/doc/lxc-console.sgml.in index 9298a5234..92997781b 100644 --- a/doc/lxc-console.sgml.in +++ b/doc/lxc-console.sgml.in @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - diff --git a/doc/lxc-create.sgml.in b/doc/lxc-create.sgml.in index 90864e067..3969246d4 100644 --- a/doc/lxc-create.sgml.in +++ b/doc/lxc-create.sgml.in @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - diff --git a/doc/lxc-destroy.sgml.in b/doc/lxc-destroy.sgml.in index 366dc9a10..91d5d19a2 100644 --- a/doc/lxc-destroy.sgml.in +++ b/doc/lxc-destroy.sgml.in @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - @@ -81,17 +81,16 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + + + + Use an alternate container path. The default is @LXCPATH@. + + + - - - - - Use an alternate container path. The default is @LXCPATH@. - - - - diff --git a/doc/lxc-device.sgml.in b/doc/lxc-device.sgml.in index e7773823e..90cd885b5 100644 --- a/doc/lxc-device.sgml.in +++ b/doc/lxc-device.sgml.in @@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - ]> diff --git a/doc/lxc-execute.sgml.in b/doc/lxc-execute.sgml.in index de233f68f..f800ea6f0 100644 --- a/doc/lxc-execute.sgml.in +++ b/doc/lxc-execute.sgml.in @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - diff --git a/doc/lxc-freeze.sgml.in b/doc/lxc-freeze.sgml.in index fba139b59..c69e4c8e7 100644 --- a/doc/lxc-freeze.sgml.in +++ b/doc/lxc-freeze.sgml.in @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - diff --git a/doc/lxc-info.sgml.in b/doc/lxc-info.sgml.in index 03212b01a..ba0a044d1 100644 --- a/doc/lxc-info.sgml.in +++ b/doc/lxc-info.sgml.in @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - diff --git a/doc/lxc-kill.sgml.in b/doc/lxc-kill.sgml.in index 8d58db923..ad0eec018 100644 --- a/doc/lxc-kill.sgml.in +++ b/doc/lxc-kill.sgml.in @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - diff --git a/doc/lxc-ls.sgml.in b/doc/lxc-ls.sgml.in index 4af2596f9..4801dbb3f 100644 --- a/doc/lxc-ls.sgml.in +++ b/doc/lxc-ls.sgml.in @@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - ]> diff --git a/doc/lxc-monitor.sgml.in b/doc/lxc-monitor.sgml.in index eae6f8233..336061dd4 100644 --- a/doc/lxc-monitor.sgml.in +++ b/doc/lxc-monitor.sgml.in @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - diff --git a/doc/lxc-netstat.sgml.in b/doc/lxc-netstat.sgml.in index ab475f3ea..ea4c9cd53 100644 --- a/doc/lxc-netstat.sgml.in +++ b/doc/lxc-netstat.sgml.in @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - ]> diff --git a/doc/lxc-ps.sgml.in b/doc/lxc-ps.sgml.in index b0103cfd9..0b50baa9a 100644 --- a/doc/lxc-ps.sgml.in +++ b/doc/lxc-ps.sgml.in @@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - ]> diff --git a/doc/lxc-restart.sgml.in b/doc/lxc-restart.sgml.in index 9be025703..aae7958fa 100644 --- a/doc/lxc-restart.sgml.in +++ b/doc/lxc-restart.sgml.in @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - diff --git a/doc/lxc-shutdown.sgml.in b/doc/lxc-shutdown.sgml.in index a4f3accfd..9262c6d79 100644 --- a/doc/lxc-shutdown.sgml.in +++ b/doc/lxc-shutdown.sgml.in @@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - diff --git a/doc/lxc-start-ephemeral.sgml.in b/doc/lxc-start-ephemeral.sgml.in index b753a9bf7..563acabf5 100644 --- a/doc/lxc-start-ephemeral.sgml.in +++ b/doc/lxc-start-ephemeral.sgml.in @@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - ]> diff --git a/doc/lxc-start.sgml.in b/doc/lxc-start.sgml.in index d501636a6..0bd7f9827 100644 --- a/doc/lxc-start.sgml.in +++ b/doc/lxc-start.sgml.in @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - diff --git a/doc/lxc-stop.sgml.in b/doc/lxc-stop.sgml.in index 33e3064b9..b4dcc1bcf 100644 --- a/doc/lxc-stop.sgml.in +++ b/doc/lxc-stop.sgml.in @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - diff --git a/doc/lxc-top.sgml.in b/doc/lxc-top.sgml.in index 2a4f83541..a3aa8e5dd 100644 --- a/doc/lxc-top.sgml.in +++ b/doc/lxc-top.sgml.in @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - ]> diff --git a/doc/lxc-unfreeze.sgml.in b/doc/lxc-unfreeze.sgml.in index 34a2cf402..6b999ea72 100644 --- a/doc/lxc-unfreeze.sgml.in +++ b/doc/lxc-unfreeze.sgml.in @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - diff --git a/doc/lxc-unshare.sgml.in b/doc/lxc-unshare.sgml.in index 5c899b63d..7e862bb79 100644 --- a/doc/lxc-unshare.sgml.in +++ b/doc/lxc-unshare.sgml.in @@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - diff --git a/doc/lxc-version.sgml.in b/doc/lxc-version.sgml.in index 3833e9fc7..fbda32c66 100644 --- a/doc/lxc-version.sgml.in +++ b/doc/lxc-version.sgml.in @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - ]> diff --git a/doc/lxc-wait.sgml.in b/doc/lxc-wait.sgml.in index b43061f6d..27940677d 100644 --- a/doc/lxc-wait.sgml.in +++ b/doc/lxc-wait.sgml.in @@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - diff --git a/doc/lxc.conf.sgml.in b/doc/lxc.conf.sgml.in index 6fb0d0c42..0a5a52a41 100644 --- a/doc/lxc.conf.sgml.in +++ b/doc/lxc.conf.sgml.in @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - ]> diff --git a/doc/lxc.sgml.in b/doc/lxc.sgml.in index a333c49cd..b06515d55 100644 --- a/doc/lxc.sgml.in +++ b/doc/lxc.sgml.in @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - ]>