diff options
| -rw-r--r-- | buildlib/environment.mak.in | 4 | ||||
| -rw-r--r-- | buildlib/sgml_manpage.mak | 6 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | debian/control | 2 |
4 files changed, 4 insertions, 11 deletions
diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in index 6b88e9ce6..70e9bff81 100644 --- 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 607ead373..5fcb75c46 100644 --- 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 f38c5e563..edadbf2e6 100644 --- 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 7059ea58d..99da566b4 100644 --- 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 |