Fix building of sgml manpages.

Author: doogie
Date: 2003-02-02 08:05:31 GMT
Fix building of sgml manpages.

diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index 6b88e9ce6cb4904af3ec4fa82a29f5b560b511de..70e9bff8176a3ea63361e3e523785328b53718a3 100644 (file)
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -29,9 +29,7 @@ DEBIANDOC_HTML = @DEBIANDOC_HTML@
 DEBIANDOC_TEXT = @DEBIANDOC_TEXT@
 
 # SGML for the man pages
-NSGMLS = @NSGMLS@
-SGMLSPL = @SGMLSPL@
-DOCBOOK2MAN := $(wildcard /usr/lib/perl5/sgmlspl-specs/docbook2man-spec.pl)
+DOCBOOK2MAN := @DOCBOOK2MAN@
 
 # Gettext settings
 GMSGFMT = @GMSGFMT@

diff --git a/buildlib/sgml_manpage.mak b/buildlib/sgml_manpage.mak
index 607ead3735be208a46bb5a55b6dbd069e4ef1138..5fcb75c464e96bde80bca8eca397ef2ee5ba797c 100644 (file)
--- a/buildlib/sgml_manpage.mak
+++ b/buildlib/sgml_manpage.mak
@@ -11,8 +11,6 @@
 # See defaults.mak for information about LOCAL
 
 # Some local definitions
-ifdef NSGMLS
-ifdef SGMLSPL
 ifdef DOCBOOK2MAN
 
 LOCAL := sgml-manpage-$(firstword $(SOURCE))
@@ -24,7 +22,7 @@ veryclean: veryclean/$(LOCAL)
 
 $($(LOCAL)-LIST) :: % : %.sgml $(INCLUDES)
        echo Creating man page $@
-       $(NSGMLS) $< | $(SGMLSPL) $(DOCBOOK2MAN) 
+       $(DOCBOOK2MAN) $<
 
 # Clean rule
 .PHONY: veryclean/$(LOCAL)
@@ -33,8 +31,6 @@ veryclean/$(LOCAL):
 
 HAVE_SGML=yes
 endif
-endif
-endif
 
 INCLUDES :=
 

diff --git a/configure.in b/configure.in
index f38c5e5634ddf5e182928490e6c7acd9d9c0fca5..edadbf2e6a21656513b953692511581457505b0f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -158,8 +158,7 @@ AC_PATH_PROG(DEBIANDOC_HTML,debiandoc2html)
 AC_PATH_PROG(DEBIANDOC_TEXT,debiandoc2text)
 
 dnl Check for the SGML tools needed to build man pages
-AC_PATH_PROG(NSGMLS,nsgmls)
-AC_PATH_PROG(SGMLSPL,sgmlspl)
+AC_PATH_PROG(DOCBOOK2MAN,docbook2man)
 
 dnl Check for YODL
 dnl AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","")

diff --git a/debian/control b/debian/control
index 7059ea58deb20d84534e35b5f18ff1f57de8ab61..99da566b407d1803219d0ab62d4e38a5f25d684b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: important
 Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Jason Gunthorpe <jgg@debian.org>
 Standards-Version: 3.1.1
-Build-Depends: debhelper, debiandoc-sgml, libdb2-dev
+Build-Depends: debhelper, docbook-utils, libdb2-dev
 
 Package: apt
 Architecture: any