2 files changed, 23 insertions, 75 deletions
diff --git a/doc/ja/makefile b/doc/ja/makefile
index da566cc96..f44bb1c0f 100644
--- a/doc/ja/makefile
+++ b/doc/ja/makefile
@@ -5,71 +5,7 @@ SUBDIR=doc/ja
 # Bring in the default rules
 include ../../buildlib/defaults.mak
 
-# Do not use XMLTO, build the manpages directly with XSLTPROC
-XSLTPROC=/usr/bin/xsltproc
-STYLESHEET=./style.ja.xsl
-
-
-# Man pages
-SOURCE = apt-cache.ja.8 apt-get.ja.8 apt-cdrom.ja.8 apt.conf.ja.5 \
-	 sources.list.ja.5 apt-config.ja.8 apt-sortpkgs.ja.1 \
-	 apt-ftparchive.ja.1 apt_preferences.ja.5 apt-extracttemplates.ja.1 \
-	 apt-key.ja.8 apt-secure.ja.8 apt-mark.ja.8
-
-INCLUDES = apt.ent
-
-doc: $(SOURCE)
-
-clean: clean-manpages
-
-clean-manpages:
-	rm -f $(SOURCE) \
-	      $(patsubst %.ja.1,%.1,$(SOURCE)) \
-	      $(patsubst %.ja.5,%.5,$(SOURCE)) \
-	      $(patsubst %.ja.8,%.8,$(SOURCE))
-
-$(SOURCE) ::  % : %.xml $(INCLUDES)
-	echo Creating man page $@
-	$(XSLTPROC) -o $@ $(STYLESHEET) $<
-
-apt-cache.ja.8:: apt-cache.8
-	cp $< $@
-
-apt-get.ja.8:: apt-get.8
-	cp $< $@
-
-apt-cdrom.ja.8:: apt-cdrom.8
-	cp $< $@
-
-apt.conf.ja.5:: apt.conf.5
-	cp $< $@
-
-apt-config.ja.8:: apt-config.8
-	cp $< $@
-
-sources.list.ja.5:: sources.list.5
-	cp $< $@
-
-apt-sortpkgs.ja.1:: apt-sortpkgs.1
-	cp $< $@
-
-apt-ftparchive.ja.1:: apt-ftparchive.1
-	cp $< $@
-
-apt_preferences.ja.5:: apt_preferences.5
-	cp $< $@
-
-apt-extracttemplates.ja.1:: apt-extracttemplates.1
-	cp $< $@
-
-apt-key.ja.8:: apt-key.8
-	cp $< $@
-
-apt-secure.ja.8:: apt-secure.8
-	cp $< $@
-
-apt-mark.ja.8:: apt-mark.8
-	cp $< $@
-
-
+# Language Code of this translation
+LC=ja
 
+include $(PO4A_MANPAGE_H)
diff --git a/doc/makefile b/doc/makefile
index e12de7228..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,27 +26,39 @@ TARGET = binary
 include $(COPY_H)
 
 #.PHONY: headers library clean veryclean all binary program doc doc.pt_BR doc.fr
-doc: po4a
+doc:
 	for dir in $(SUBDIRS); do\
 		$(MAKE) -C $$dir $@; \
 	done
 
-.PHONY: update-po po4a
-update-po:
-	po4a --previous --no-backups --force --no-translations po4a.conf
-
-clean: po4a-clean clean-subdirs
+clean: clean-subdirs
+veryclean: veryclean-subdirs
 
 clean-subdirs:
 	for dir in $(SUBDIRS); do\
-		$(MAKE) -C $$dir $@; \
+		$(MAKE) -C $$dir clean; \
+	done
+
+veryclean-subdirs:
+	for dir in $(SUBDIRS); do\
+		$(MAKE) -C $$dir veryclean; \
 	done
 
+ifdef PO4A
+doc: po4a
+
+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 \) )