From: KATOH Yasufumi <karma@jazz.email.ne.jp>
Date: Wed, 25 Sep 2013 10:36:30 +0000 (+0900)
Subject: doc: Japanese man pages is not generated when docbook-utils is used
X-Git-Tag: lxc-1.0.0.alpha2~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cb14f34a92e0a8eae07db027344126bf5c901c9;p=thirdparty%2Flxc.git

doc: Japanese man pages is not generated when docbook-utils is used

Character encoding of Japanese man pages is UTF-8. But docbook-utils
can't treat it (and don't have --encoding option that use in
Makefile). So change to Japanese man pages is not generated when
docbook-utils is used.

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/configure.ac b/configure.ac
index a52358365..092a67d7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,6 +91,7 @@ if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then
 	AC_SUBST(db2xman)
 fi
 AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$db2xman" != "x"])
+AM_CONDITIONAL([USE_DOCBOOK2X], [test "x$db2xman" != "xdocbook2man"])
 
 if test "x$db2xman" = "xdocbook2man"; then
 	docdtd="\"-//Davenport//DTD DocBook V3.0//EN\""
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f2a106baa..1e83f8a9a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,10 @@
-SUBDIRS = examples rootfs ja
-DIST_SUBDIRS = examples rootfs ja
+SUBDIRS = examples rootfs
+DIST_SUBDIRS = examples rootfs
+
+if USE_DOCBOOK2X
+SUBDIRS += ja
+DIST_SUBDIRS += ja
+endif
 
 EXTRA_DIST = \
 	FAQ.txt