merge with my po4a branch & update both pot's

Thanks again for the initial patch from KURASAWA Nozomu and
for the improvements and cleanups done by Nicolas François
to get po4a up and running for apt man page translations!

1 files changed, 29 insertions, 12 deletions

diff --git a/doc/makefile b/doc/makefile
index 6ea1c1343..2a2663fb3 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -1,7 +1,7 @@
 # -*- make -*-
 BASE=..
 SUBDIR=doc
-SUBDIRS= fr ja pl pt_BR es
+SUBDIRS= $(dir $(wildcard */makefile))
 
 # Bring in the default rules
 include ../buildlib/defaults.mak
@@ -26,22 +26,39 @@ TARGET = binary
 include $(COPY_H)
 
 #.PHONY: headers library clean veryclean all binary program doc doc.pt_BR doc.fr
-doc: doc.fr doc.ja doc.pl doc.pt_BR doc.es
+doc:
+	for dir in $(SUBDIRS); do\
+		$(MAKE) -C $$dir $@; \
+	done
 
-doc.fr: %.fr:
-	$(MAKE) -C fr $*
+clean: clean-subdirs
+veryclean: veryclean-subdirs
 
-doc.pt_BR: %.pt_BR:
-	$(MAKE) -C pt_BR $*
+clean-subdirs:
+	for dir in $(SUBDIRS); do\
+		$(MAKE) -C $$dir clean; \
+	done
 
-doc.es: %.es:
-	$(MAKE) -C es $*
+veryclean-subdirs:
+	for dir in $(SUBDIRS); do\
+		$(MAKE) -C $$dir veryclean; \
+	done
 
-doc.ja: %.ja:
-	$(MAKE) -C ja $*
+ifdef PO4A
+doc: po4a
 
-doc.pl: %.pl:
-	$(MAKE) -C pl $*
+clean: po4a-clean
+
+.PHONY: update-po po4a
+update-po:
+	po4a --previous --no-backups --force --no-translations po4a.conf
+
+po4a-clean:
+	po4a --previous --rm-backups --rm-translations po4a.conf
+
+po4a:
+	po4a --previous --no-backups po4a.conf
+endif
 
 ifdef DOXYGEN
 DOXYGEN_SOURCES = $(shell find $(BASE)/apt-pkg -not -name .\\\#* -and \( -name \*.cc -or -name \*.h \) )