summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.defs.in1
-rw-r--r--Makefile.rules.in4
-rw-r--r--configure.ac22
3 files changed, 20 insertions, 7 deletions
diff --git a/Makefile.defs.in b/Makefile.defs.in
index 3fee9c22..915d3d83 100644
--- a/Makefile.defs.in
+++ b/Makefile.defs.in
@@ -6,6 +6,7 @@ YACC = @YACC@
MKDIR_P = @MKDIR_P@
INSTALL = @INSTALL@
SED = @SED@
+DB2MAN = @DB2MAN@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
diff --git a/Makefile.rules.in b/Makefile.rules.in
index ae563a54..6a009161 100644
--- a/Makefile.rules.in
+++ b/Makefile.rules.in
@@ -37,11 +37,11 @@ configure: configure.ac
%.8: %.xml $(makedeps)
@echo -e " MAN\t\t$@"
- (cd $(SUBDIR); docbook2x-man ../$<)
+ (cd $(SUBDIR); $(DB2MAN) --xinclude ../$<)
%.pdf: %.xml $(makedeps)
@echo -e " PDF\t\t$@"
- db2pdf -o $(SUBDIR) $<
+ dblatex -q -t pdf -o $@ $<
archive:
git archive --prefix=nftables-@PACKAGE_VERSION@/ HEAD | \
diff --git a/configure.ac b/configure.ac
index 6a5e4ce6..8cf76133 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,16 +25,28 @@ AC_PROG_MKDIR_P
AC_PROG_INSTALL
AC_PROG_SED
-AC_CHECK_PROG(CONFIG_MAN, docbook2x-man, y, n)
-if test "$CONFIG_MAN" != "y"
+AC_CHECK_PROG(CONFIG_MAN1, [docbook2x-man], [y], [n])
+if test "$CONFIG_MAN1" == "y"
then
- AC_MSG_WARN([docbookx2-man not found, no manpages will be built])
+ CONFIG_MAN=y
+ DB2MAN=docbook2x-man
+else
+ AC_CHECK_PROG(CONFIG_MAN2, [db2x_docbook2man], [y], [n])
+ if test "$CONFIG_MAN2" == "y"
+ then
+ CONFIG_MAN=y
+ DB2MAN=db2x_docbook2man
+ else
+ AC_MSG_WARN([docbookx2-man/db2x_docbook2man not found, no manpages will be built])
+ fi
fi
+AC_SUBST(CONFIG_MAN)
+AC_SUBST(DB2MAN)
-AC_CHECK_PROG(CONFIG_PDF, db2pdf, y, n)
+AC_CHECK_PROG(CONFIG_PDF, dblatex, y, n)
if test "$CONFIG_PDF" != "y"
then
- AC_MSG_WARN([db2pdf not found, no PDF manpages will be built])
+ AC_MSG_WARN([dblatex not found, no PDF manpages will be built])
fi
AC_PATH_PROG(LEX, [flex])