New man pages build system.

ChangeLog

@@ -1,3 +1,8 @@
+2007-01-16  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* configure.ac: There are no more Makefiles to generate in the
+	man/ subdirectories.
+
 2007-01-15  Ian Jackson  <iwj@ubuntu.com>
 
 	* src/processarc.c (process_archive): Add a missing newline to a

configure.ac

@@ -109,17 +109,6 @@ AC_CONFIG_FILES([ Makefile
 		  intl/Makefile
 		  lib/Makefile
 		  man/Makefile
-		  man/C/Makefile
-		  man/de/Makefile
-		  man/es/Makefile
-		  man/fr/Makefile
-		  man/hu/Makefile
-		  man/ja/Makefile
-		  man/pl/Makefile
-		  man/pt_BR/Makefile
-		  man/ru/Makefile
-		  man/sv/Makefile
-		  man/po4a/Makefile
 		  origins/Makefile
 		  po/Makefile.in
 		  scripts/Makefile

man/C/.gitignore

@@ -1 +0,0 @@
-Makefile.in

man/C/Makefile.am

@@ -1,43 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-dist_man_MANS = \
-	822-date.1 \
-	cleanup-info.8 \
-	deb-control.5 \
-	deb-old.5 \
-	deb.5 \
-	dpkg-architecture.1 \
-	dpkg-checkbuilddeps.1 \
-	dpkg-deb.1 \
-	dpkg-divert.8 \
-	dpkg-name.1 \
-	dpkg-query.1 \
-	dpkg-scanpackages.1 \
-	dpkg-scansources.1 \
-	dpkg-source.1 \
-	dpkg-split.1 \
-	dpkg-statoverride.8 \
-	dpkg.1 \
-	dpkg.cfg.5 \
-	dselect.1 \
-	dselect.cfg.5 \
-	install-info.8 \
-	start-stop-daemon.8 \
-	update-alternatives.8
-
-dpkg_source_aliases = \
-	dpkg-buildpackage.1 \
-	dpkg-distaddfile.1 \
-	dpkg-genchanges.1 \
-	dpkg-gencontrol.1 \
-	dpkg-parsechangelog.1 \
-	dpkg-shlibdeps.1
-
-man_MANS = $(dpkg_source_aliases)
-CLEANFILES = $(dpkg_source_aliases)
-
-
-$(dpkg_source_aliases):
-	echo ".so man1/dpkg-source.1" > $@
-	chmod 644 $@
-

man/ChangeLog

@@ -1,3 +1,24 @@
+2007-01-16  Nicolas Francois  <nicolas.francois@centraliens.net>
+
+	* po/: New directory.
+	* po/dpkg-man.pot, po/de.po, po/es.po, po/fr.po, po/hu.po,
+	po/ja.po, po/pl.po, po/pt_BR.po, po/ru.po, po/sv.po: Merge the POs
+	which used to be in po4a/. When multiple translations appeared for
+	a string, the string was marked as fuzzy. Also the POs now contain
+	the strings of all the man pages.
+	* po/add_de/, po/add_es, po/add_fr, po/add_hu, po/add_ja,
+	po/add_pl, po/add_pt_BR, po/add_ru, po/add_sv: Move the add_<lang>
+	directories from po4a/ to po/.
+	* po4a/: Removed.
+	* C/: Move the manpages to the root of the man/ directory.
+	* C/Makefile.am, de/Makefile.am es/Makefile.am, fr/Makefile.am,
+	hu/Makefile.am, ja/Makefile.am, pl/Makefile.am, pt_BR/Makefile.am,
+	ru/Makefile.am, sv/Makefile.am, po4a.mk: The languages makefiles
+	are no more needed. Also remove the language directories.
+	* Makefile.am: New build system.
+	The goal of these changes is to simplify the build system (less
+	files, less Makefiles, lower the depth of the file hierarchy).
+
 2007-01-09  Nicolas Francois  <nicolas.francois@centraliens.net>
 
 	* C/dpkg-deb.1: Make the copyright match the one from the source.

man/Makefile.am

@@ -1,10 +1,76 @@
 ## Process this file with automake to produce Makefile.in
 
-# po4a must be the first sub-directory because it generates the translations.
-SUBDIRS = C po4a de es fr hu ja pl pt_BR ru sv
+all-local:
+	po4a --no-backups --variable srcdir=$(srcdir) \
+		$(srcdir)/po/po4a.cfg
+# Make the symlink
+	for lang in $(LINGUAS); do \
+		cd $$lang; \
+		$(MAKE) -f ../Makefile -B $(dpkg_source_aliases) \
+			srcdir="$(realpath $(srcdir))/$$lang"; \
+		cd ..; \
+	done
+
+clean-local:
+	po4a --rm-backups --rm-translations --variable srcdir=$(srcdir) \
+		$(srcdir)/po/po4a.cfg
+
+# Extract the list of languages from the po4a config file.
+LINGUAS = $(shell sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po/po4a.cfg)
 
-.PHONY: updatepo
-updatepo:
-	list='$(SUBDIRS)'; for dir in $$list; do \
-		$(MAKE) -C "$$dir" updatepo; \
+install-data-local:
+	for lang in $(LINGUAS); do \
+		if [ -d $$lang ]; then \
+			cd $$lang; \
+			files=$$(echo *.[1-9]); \
+			$(MAKE) -f ../Makefile install-man \
+				mandir="$(mandir)/$$lang" \
+				man_MANS="" \
+				dist_man_MANS="$$files"; \
+			cd ..; \
+		fi \
 	done
+
+dist_man_MANS = \
+	822-date.1 \
+	cleanup-info.8 \
+	deb-control.5 \
+	deb-old.5 \
+	deb.5 \
+	dpkg-architecture.1 \
+	dpkg-checkbuilddeps.1 \
+	dpkg-deb.1 \
+	dpkg-divert.8 \
+	dpkg-name.1 \
+	dpkg-query.1 \
+	dpkg-scanpackages.1 \
+	dpkg-scansources.1 \
+	dpkg-source.1 \
+	dpkg-split.1 \
+	dpkg-statoverride.8 \
+	dpkg.1 \
+	dpkg.cfg.5 \
+	dselect.1 \
+	dselect.cfg.5 \
+	install-info.8 \
+	start-stop-daemon.8 \
+	update-alternatives.8
+
+dpkg_source_aliases = \
+	dpkg-buildpackage.1 \
+	dpkg-distaddfile.1 \
+	dpkg-genchanges.1 \
+	dpkg-gencontrol.1 \
+	dpkg-parsechangelog.1 \
+	dpkg-shlibdeps.1
+
+man_MANS = $(dpkg_source_aliases)
+CLEANFILES = $(dpkg_source_aliases)
+
+
+$(dpkg_source_aliases):
+	if [ -f dpkg-source.1 ] || [ -f $(srcdir)/dpkg-source.1 ]; then \
+		echo ".so man1/dpkg-source.1" > $@; \
+		chmod 644 $@; \
+	fi
+

man/de/.gitignore

@@ -1 +0,0 @@
-Makefile.in

man/de/Makefile.am

@@ -1,6 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-lang=de
-
-include ../po4a.mk
-

man/es/.gitignore

@@ -1 +0,0 @@
-Makefile.in

man/es/Makefile.am

@@ -1,6 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-lang=es
-
-include ../po4a.mk
-

man/fr/.gitignore

@@ -1 +0,0 @@
-Makefile.in

man/fr/Makefile.am

@@ -1,6 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-lang=fr
-
-include ../po4a.mk
-

man/hu/.gitignore

@@ -1 +0,0 @@
-Makefile.in

man/hu/Makefile.am

@@ -1,6 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-lang=hu
-
-include ../po4a.mk
-

man/ja/.gitignore

@@ -1 +0,0 @@
-Makefile.in

man/ja/Makefile.am

@@ -1,6 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-lang=ja
-
-include ../po4a.mk
-

man/pl/.gitignore

@@ -1 +0,0 @@
-Makefile.in

man/pl/Makefile.am

@@ -1,6 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-lang=pl
-
-include ../po4a.mk
-