Temporary fix to install man pages: specify targets manually

12 files changed, 39 insertions, 8 deletions

diff --git a/buildlib/doc.mk b/buildlib/doc.mk
index ac8e8ab7..f8378b0b 100644
--- a/buildlib/doc.mk
+++ b/buildlib/doc.mk
@@ -3,11 +3,12 @@
 
 HTML2TEXT = $(top_srcdir)/doc/html-to-text
 
-mandir = $(if $(findstring en,$(LC)),@mandir@,@mandir@/$(LC))
-htmldir = @htmldir@/$(LC)
-imagesdir = $(htmldir)/images
+mandir = @mandir@/${LC}
+htmldir = @htmldir@/${LC}
+imagesdir = ${htmldir}/images
 
-man_MANS =
+#man_MANS =
+#notrans_man_MANS =
 html_DATA =
 images_DATA =
 pkgdata_DATA = $(README)
diff --git a/buildlib/docbook.mk b/buildlib/docbook.mk
index 9a0cfa48..43b84f40 100644
--- a/buildlib/docbook.mk
+++ b/buildlib/docbook.mk
@@ -10,8 +10,7 @@ DOCBOOK_HTML_XSL ?= aptitude-html.xsl aptitude-common.xsl
 
 DOCBOOK_HTML ?= $(wildcard output-html/*.html) $(wildcard output-html/*.css)
 DOCBOOK_HTML_IMAGES ?= $(wildcard output-html/images/*.png) $(wildcard output-html/images/*.gif)
-DOCBOOK_MANS ?= $(call dbiftargets,docbook-man, \
-	aptitude.8 aptitude-create-state-bundle.1 aptitude-run-state-bundle.1)
+DOCBOOK_MANS ?= aptitude.8 aptitude-create-state-bundle.1 aptitude-run-state-bundle.1
 
 docbook-stamp: $(DOCBOOK_TARGETS)
 	touch docbook-stamp
@@ -58,7 +57,8 @@ dbuninstall = @list='$(1)'; test -n "$(2)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(2)'; $(am__uninstall_files_from_dir)
 
-man_MANS += $(DOCBOOK_MANS)
+#man_MANS += $(filter aptitude.8,$(DOCBOOK_MANS))
+#notrans_man_MANS += $(filter-out aptitude.8,$(DOCBOOK_MANS))
 
 install-docbook-html: docbook-html
 	@$(NORMAL_INSTALL)
diff --git a/doc/cs/Makefile.am b/doc/cs/Makefile.am
index 67fdf8b7..9c676aff 100644
--- a/doc/cs/Makefile.am
+++ b/doc/cs/Makefile.am
@@ -17,4 +17,5 @@ include $(top_srcdir)/buildlib/docbook.mk
 
 all-local: docbook-stamp
 
-
+man_MANS = aptitude.8
+#notrans_man_MANS = aptitude-create-state-bundle.1 aptitude-run-state-bundle.1
diff --git a/doc/de/Makefile.am b/doc/de/Makefile.am
index 958497c2..47b6af29 100644
--- a/doc/de/Makefile.am
+++ b/doc/de/Makefile.am
@@ -9,7 +9,11 @@ include $(top_srcdir)/buildlib/doc.mk
 include $(top_srcdir)/buildlib/po4a.mk
 
 DOCBOOK_TARGETS = docbook-man
+DOCBOOK_MANS = aptitude.8
 
 include $(top_srcdir)/buildlib/docbook.mk
 
 all-local: docbook-stamp
+
+man_MANS = aptitude.8
+#notrans_man_MANS = aptitude-create-state-bundle.1 aptitude-run-state-bundle.1
diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am
index b515eaf2..687aee26 100644
--- a/doc/en/Makefile.am
+++ b/doc/en/Makefile.am
@@ -15,3 +15,6 @@ DOCBOOK_TARGETS = docbook-man docbook-html docbook-readme
 include $(top_srcdir)/buildlib/docbook.mk
 
 all-local: docbook-stamp
+
+man_MANS = aptitude.8
+notrans_man_MANS = aptitude-create-state-bundle.1 aptitude-run-state-bundle.1
diff --git a/doc/es/Makefile.am b/doc/es/Makefile.am
index c704e081..147e5808 100644
--- a/doc/es/Makefile.am
+++ b/doc/es/Makefile.am
@@ -16,3 +16,6 @@ DOCBOOK_TARGETS = docbook-man docbook-html docbook-readme
 include $(top_srcdir)/buildlib/docbook.mk
 
 all-local: docbook-stamp
+
+man_MANS = aptitude.8
+notrans_man_MANS = aptitude-create-state-bundle.1 aptitude-run-state-bundle.1
diff --git a/doc/fi/Makefile.am b/doc/fi/Makefile.am
index 294635f8..bfeb0f52 100644
--- a/doc/fi/Makefile.am
+++ b/doc/fi/Makefile.am
@@ -17,3 +17,5 @@ DOCBOOK_MANS = aptitude.8
 include $(top_srcdir)/buildlib/docbook.mk
 
 all-local: docbook-stamp
+
+man_MANS = aptitude.8
diff --git a/doc/fr/Makefile.am b/doc/fr/Makefile.am
index 06718b8f..47c2717e 100644
--- a/doc/fr/Makefile.am
+++ b/doc/fr/Makefile.am
@@ -12,7 +12,11 @@ README_encoding = utf-8
 IMAGES := $(wildcard $(srcdir)/images/*.png) $(PO4A_IMAGES)
 
 DOCBOOK_TARGETS = docbook-html docbook-man docbook-readme
+DOCBOOK_MANS = aptitude.8
 
 include $(top_srcdir)/buildlib/docbook.mk
 
 all-local: docbook-stamp
+
+man_MANS = aptitude.8
+#notrans_man_MANS = aptitude-create-state-bundle.1 aptitude-run-state-bundle.1
diff --git a/doc/it/Makefile.am b/doc/it/Makefile.am
index 33d5d4e8..700d239a 100644
--- a/doc/it/Makefile.am
+++ b/doc/it/Makefile.am
@@ -16,3 +16,6 @@ DOCBOOK_TARGETS = docbook-html docbook-man docbook-readme
 include $(top_srcdir)/buildlib/docbook.mk
 
 all-local: docbook-stamp
+
+man_MANS = aptitude.8
+notrans_man_MANS = aptitude-create-state-bundle.1 aptitude-run-state-bundle.1
diff --git a/doc/ja/Makefile.am b/doc/ja/Makefile.am
index 628ee4f5..6bbbce2e 100644
--- a/doc/ja/Makefile.am
+++ b/doc/ja/Makefile.am
@@ -19,3 +19,6 @@ DOCBOOK_TARGETS = docbook-html docbook-man docbook-readme
 include $(top_srcdir)/buildlib/docbook.mk
 
 all-local: docbook-stamp
+
+man_MANS = aptitude.8
+#notrans_man_MANS = aptitude-create-state-bundle.1 aptitude-run-state-bundle.1
diff --git a/doc/pl/Makefile.am b/doc/pl/Makefile.am
index cec4fb72..0a0b13ec 100644
--- a/doc/pl/Makefile.am
+++ b/doc/pl/Makefile.am
@@ -14,3 +14,6 @@ DOCBOOK_TARGETS = docbook-man
 include $(top_srcdir)/buildlib/docbook.mk
 
 all-local: docbook-stamp
+
+man_MANS = aptitude.8
+#notrans_man_MANS = aptitude-create-state-bundle.1 aptitude-run-state-bundle.1
diff --git a/doc/xx/Makefile.am b/doc/xx/Makefile.am
index 39b8fdf1..8d1be4b3 100644
--- a/doc/xx/Makefile.am
+++ b/doc/xx/Makefile.am
@@ -47,3 +47,7 @@ include $(top_srcdir)/buildlib/docbook.mk
 
 # Finally, this target ensures that all desired documents get built.
 all-local: docbook-stamp
+
+# Install targets for man pages must be specified manually for now.
+man_MANS = aptitude.8
+notrans_man_MANS = aptitude-create-state-bundle.1 aptitude-run-state-bundle.1