From 41f28cb341b1757162826ba2f8fc1ce75ecb25b7 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sun, 1 Nov 2009 23:36:09 +0100
Subject: disable addendum for sgml-files as we have no valid file until now
 Will be reenabled after Translators provide such a file.

---
 doc/makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/makefile')

diff --git a/doc/makefile b/doc/makefile
index 26ca52a9e..0cb135c7b 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -47,7 +47,7 @@ veryclean-subdirs:
 	# which are "left over" from older systems.
 	# After completing the transition this should be handled
 	# in the po4a-manpage makefile for all translations
-	for dir in $(subst /addendum/,, $(dir $(wildcard */addendum/debiandoc*))); do\
+	for dir in $(subst /addendum/,, $(dir $(wildcard */addendum/*))); do\
 		rm -f $$dir/offline.$$dir.sgml; \
 		rm -f $$dir/guide.$$dir.sgml; \
 	done
-- 
cgit v1.2.3


From 93517da394859666e4af08f518dfb95c4ac271dd Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 2 Nov 2009 10:26:52 +0100
Subject: fix/simplify buildsystem for the (now) po4a-only manpages

---
 doc/makefile | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'doc/makefile')

diff --git a/doc/makefile b/doc/makefile
index 0cb135c7b..fe53aba48 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -43,14 +43,6 @@ veryclean-subdirs:
 	for dir in $(SUBDIRS); do\
 		$(MAKE) -C $$dir veryclean; \
 	done
-	# FIXME remove created sgml files, but preserve all
-	# which are "left over" from older systems.
-	# After completing the transition this should be handled
-	# in the po4a-manpage makefile for all translations
-	for dir in $(subst /addendum/,, $(dir $(wildcard */addendum/*))); do\
-		rm -f $$dir/offline.$$dir.sgml; \
-		rm -f $$dir/guide.$$dir.sgml; \
-	done
 
 ifdef PO4A
 doc: po4a
-- 
cgit v1.2.3


From e46a23a59689c917ad3e589a84add9fdfa498159 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 2 Nov 2009 17:54:22 +0100
Subject: remove traces of old manpage-buildsystems

---
 doc/makefile | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

(limited to 'doc/makefile')

diff --git a/doc/makefile b/doc/makefile
index fe53aba48..6fb604e4e 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -11,13 +11,34 @@ SOURCE = $(wildcard *.sgml)
 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
@@ -78,5 +99,4 @@ $(BUILD)/doc/doxygen-stamp: $(DOXYGEN_SOURCES) $(BUILD)/doc/Doxyfile
 	touch $(BUILD)/doc/doxygen-stamp
 
 doc: $(BUILD)/doc/doxygen-stamp
-
 endif
-- 
cgit v1.2.3