From f8c5c03e77b79ef96890eac2ddc0e500465847d8 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Sat, 26 Feb 2011 11:46:52 +0100
Subject: [PATCH] prepare manpage generation in makefile

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 .gitignore                                    |  1 +
 Makefile                                      | 30 ++++++++++++-------
 ...ist-explorers.text => cdist-explorer.text} |  0
 ...ist-manifests.text => cdist-manifest.text} |  0
 doc/man/{cdist-types.text => cdist-type.text} |  0
 5 files changed, 20 insertions(+), 11 deletions(-)
 rename doc/man/{cdist-explorers.text => cdist-explorer.text} (100%)
 rename doc/man/{cdist-manifests.text => cdist-manifest.text} (100%)
 rename doc/man/{cdist-types.text => cdist-type.text} (100%)

diff --git a/.gitignore b/.gitignore
index b4ec3d44..099d7de3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .*.swp
 doc/man/*.[1-9]
+doc/man/.marker
diff --git a/Makefile b/Makefile
index 8125519e..888f6561 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,22 @@
+# General
 PREFIX=/usr
 BINDIR=$(PREFIX}/bin
+A2X=a2x -f manpage --no-xmllint
+
+# Developer only
 WEBDIR=$$HOME/niconetz
 WEBPAGE=software/cdist.mdwn
 
-MANSRC=doc/man/cdist-config-layout.text doc/man/cdist-config.text \
-   doc/man/cdist-deploy-to.text doc/man/cdist-design.text			\
-   doc/man/cdist-environment.text doc/man/cdist-explorers.text 	\
-	doc/man/cdist-language.text doc/man/cdist-manifests.text 		\
-	doc/man/cdist-quickstart.text doc/man/cdist-stages.text 			\
-	doc/man/cdist-terms.text doc/man/cdist.text 							\
-	doc/man/cdist-types.text
+MANSRC=doc/man/cdist-config-layout.text \
+	doc/man/cdist-config.text 		\
+   doc/man/cdist-deploy-to.text 	\
+	doc/man/cdist-explorer.text	\
+	doc/man/cdist-manifest.text 	\
+	doc/man/cdist-quickstart.text \
+	doc/man/cdist-stages.text		\
+	doc/man/cdist-terms.text 		\
+	doc/man/cdist.text 				\
+	doc/man/cdist-type.text
 
 
 # FIXME: some distro nerd, can you make this more beautiful?
@@ -33,10 +40,11 @@ web:
 pub:
 	git push --mirror
 
-man:
-	echo $(MANSRC)
-	a2x -f manpage --no-xmllint doc/man/cdist-stages.text
-	echo man ./doc/man/cdist-stages.7
+man: doc/man/.marker
+
+doc/man/.marker: $(MANSRC)
+	for man in $(MANSRC); do $(A2X) $$man; done
+	touch $@
 
 clean:
 	rm -f doc/man/*.html doc/man/*.[1-9]
diff --git a/doc/man/cdist-explorers.text b/doc/man/cdist-explorer.text
similarity index 100%
rename from doc/man/cdist-explorers.text
rename to doc/man/cdist-explorer.text
diff --git a/doc/man/cdist-manifests.text b/doc/man/cdist-manifest.text
similarity index 100%
rename from doc/man/cdist-manifests.text
rename to doc/man/cdist-manifest.text
diff --git a/doc/man/cdist-types.text b/doc/man/cdist-type.text
similarity index 100%
rename from doc/man/cdist-types.text
rename to doc/man/cdist-type.text