PROGRAM_H = $(BASE)/buildlib/program.mak
PYTHON_H = $(BASE)/buildlib/python.mak
COPY_H = $(BASE)/buildlib/copy.mak
-YODL_MANPAGE_H = $(BASE)/buildlib/yodl_manpage.mak
-SGML_MANPAGE_H = $(BASE)/buildlib/sgml_manpage.mak
PO4A_MANPAGE_H = $(BASE)/buildlib/po4a_manpage.mak
-XML_MANPAGE_H = $(BASE)/buildlib/xml_manpage.mak
FAIL_H = $(BASE)/buildlib/fail.mak
PODOMAIN_H = $(BASE)/buildlib/podomain.mak
DOXYGEN = @DOXYGEN@
-# SGML for the man pages
-DOCBOOK2MAN := @DOCBOOK2MAN@
-
-# XML for the man pages
-XMLTO := @XMLTO@
-
-# po4a for the man pages
+# xsltproc for the man pages
XSLTPROC := @XSLTPROC@
# po4a for the man pages
+++ /dev/null
-# -*- make -*-
-
-# This handles man pages in DocBook XML format. We convert to the respective
-# output in the source directory then copy over to the final dest. This
-# means xmlto is only needed if compiling from Arch
-
-# Input
-# $(SOURCE) - The documents to use, in the form foo.sect, ie apt-cache.8
-# the XML files are called apt-cache.8.xml
-
-# See defaults.mak for information about LOCAL
-
-# Some local definitions
-ifdef XMLTO
-
-LOCAL := xml-manpage-$(firstword $(SOURCE))
-$(LOCAL)-LIST := $(SOURCE)
-
-# Install generation hooks
-doc: $($(LOCAL)-LIST)
-veryclean: veryclean/$(LOCAL)
-
-$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES)
- echo Creating man page $@
- $(XMLTO) man $<
-
-# Clean rule
-.PHONY: veryclean/$(LOCAL)
-veryclean/$(LOCAL):
- -rm -rf $($(@F)-LIST)
-
-HAVE_XMLTO=yes
-endif
-
-INCLUDES :=
-
-ifndef HAVE_XMLTO
-# Strip from the source list any man pages we dont have compiled already
-SOURCE := $(wildcard $(SOURCE))
-endif
-
-# Chain to the manpage rule
-ifneq ($(words $(SOURCE)),0)
-include $(MANPAGE_H)
-endif
+++ /dev/null
-# -*- make -*-
-
-# This handles man pages in YODL format. We convert to the respective
-# output in the source directory then copy over to the final dest. This
-# means yodl is only needed if compiling from CVS
-
-# Input
-# $(SOURCE) - The documents to use, in the form foo.sect, ie apt-cache.8
-# the yodl files are called apt-cache.8.yo
-
-# See defaults.mak for information about LOCAL
-
-# Some local definitions
-ifdef YODL_MAN
-
-LOCAL := yodl-manpage-$(firstword $(SOURCE))
-$(LOCAL)-LIST := $(SOURCE)
-
-# Install generation hooks
-doc: $($(LOCAL)-LIST)
-veryclean: veryclean/$(LOCAL)
-
-$($(LOCAL)-LIST) :: % : %.yo
- echo Creating man page $@
- yodl2man -o $@ $<
-
-# Clean rule
-.PHONY: veryclean/$(LOCAL)
-veryclean/$(LOCAL):
- -rm -rf $($(@F)-LIST)
-
-else
-
-# Strip from the source list any man pages we dont have compiled already
-SOURCE := $(wildcard $(SOURCE))
-
-endif
-
-# Chain to the manpage rule
-ifneq ($(words $(SOURCE)),0)
-include $(MANPAGE_H)
-endif
dnl Check for doxygen
AC_PATH_PROG(DOXYGEN, doxygen)
-dnl Check for the SGML tools needed to build man pages
-AC_PATH_PROG(DOCBOOK2MAN,docbook2man)
-
-dnl Check for the XML tools needed to build man pages
-AC_PATH_PROG(XMLTO,xmlto)
-
dnl Check for the XSLTProc tool needed to build man pages together with po4a
AC_PATH_PROG(XSLTPROC,xsltproc)
DOTDIR=$(dirname $DOT)
AC_SUBST(DOTDIR)
-dnl Check for YODL
-dnl AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","")
-
ah_NUM_PROCS
rc_GLIBC_VER
rc_LIBSTDCPP_VER
* buildlib/configure.mak, buildlib/config.{sub,guess}:
- remove (outdated) config.{sub,guess} and use the ones provided
by the new added build-dependency autotools-dev instead
+ * configure.in, buildlib/{xml,yodl,sgml}_manpage.mak:
+ - remove the now obsolete manpage buildsystems
+ * doc/{pl,pt_BR,es,it}/*.{sgml,xml}:
+ - convert all remaining translation to the po4a system
+ * debian/control:
+ - drop build-dependency on docbook-utils and xmlto
+ - add build-dependency on autotools-dev
[ Chris Leick ]
* doc/ various manpages:
Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
Luca Bruno <lethalman88@gmail.com>, Julian Andres Klode <jak@debian.org>
Standards-Version: 3.8.2.0
-Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto, po4a (>= 0.34-2), autotools-dev
+Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev
Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
Package: apt
DEBIANDOC_HTML_OPTIONS=-l en
include $(DEBIANDOC_H)
-# XML man pages
-SOURCE = apt-cache.8 apt-get.8 apt-cdrom.8 apt.conf.5 sources.list.5 \
- apt-config.8 apt_preferences.5 \
- apt-sortpkgs.1 apt-ftparchive.1 apt-extracttemplates.1 \
- apt-key.8 apt-secure.8 apt-mark.8
-INCLUDES = apt.ent
-include $(XML_MANPAGE_H)
+# Do not use XMLTO, build the manpages directly with XSLTPROC
+ifdef XSLTPROC
+# generate a list of accepted man page translations
+SOURCE = $(patsubst %.xml,%,$(wildcard *.?.xml))
+INCLUDES = apt.ent
+STYLESHEET=manpage-style.xsl
+
+LOCAL := manpage-$(firstword $(SOURCE))
+$(LOCAL)-LIST := $(SOURCE)
+
+# Install generation hooks
+doc: $($(LOCAL)-LIST)
+veryclean: veryclean/$(LOCAL)
+
+$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES)
+ echo Creating man page $@
+ $(XSLTPROC) -o $@ $(STYLESHEET) $<
+
+# Clean rule
+.PHONY: veryclean/$(LOCAL)
+veryclean/$(LOCAL):
+ -rm -rf $($(@F)-LIST)
+
+endif
+
+# Chain to the manpage rule
+SOURCE = apt.8
+include $(MANPAGE_H)
# Examples
SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf
touch $(BUILD)/doc/doxygen-stamp
doc: $(BUILD)/doc/doxygen-stamp
-
endif
HCoop / ntk / apt.git / commitdiff