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 a523583650d66f82176fd11c5a57c8aed7eb560c..092a67d7cebaae2c6721e7e91394da33326a3b05 100644 (file)
--- 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 f2a106baac1ecc2a3e5e2d71c673292e8a7cc02f..1e83f8a9ae15de108c2b07eb2338c21be932a9c1 100644 (file)
--- 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