From fa309545a8b272ac3b2555c3bb3a4c2ec8ccabc4 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Thu, 24 Mar 2011 23:35:39 +0100
Subject: [PATCH 01/17] more stuff for 1.4.1

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 doc/changelog | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/changelog b/doc/changelog
index cd8cd4cc..fb0bb1f9 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -1,6 +1,8 @@
 1.4.1:
-	* Manpage generation cleanup
 	* New type __key_value (Steven Armstrong)
+	* New type __apt_ppa (Steven Armstrong)
+	* Documentation: Manpage generation cleanup
+	* Documentation: Manpage fix for __apt_ppa
 
 1.4.0: 2011-03-24
 	* Add --recursive to __directory

From ca139aa444650ae3815440a1f766122035a48460 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Thu, 24 Mar 2011 23:40:56 +0100
Subject: [PATCH 02/17] fixup manpage move/html

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7b1e3dfa..98ac3a76 100644
--- a/Makefile
+++ b/Makefile
@@ -95,7 +95,7 @@ manmove: $(MAN1DST) $(MAN7DST) $(MANHTML)
 	mv doc/man/*.html $(HTMLDIR)
 	for mantype in conf/type/*/man.html; do \
 		mannew=$$(echo $$mantype | sed -e 's;conf/;cdist-;'  -e 's;/;;' -e 's;/man;;');\
-		mv $$mantype doc/html/$$mannew; \
+		mv $$mantype $(HTMLDIR)/$$mannew; \
 	done
 
 # Reference depends on conf/type/*/man.text - HOWTO with posix make?

From 042638943a028b01965430b29951d0e544000014 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Fri, 25 Mar 2011 11:17:52 +0100
Subject: [PATCH 03/17] begin real clean manpage solution

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 Makefile | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 98ac3a76..fb6161b2 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,10 @@ WEBPAGE=$(WEBBASE).mdwn
 
 # Documentation
 MANDIR=doc/man
-HTMLDIR=$(MANDIR)/html
+
+MAN1DSTDIR=$(MANDIR)/man1
+MAN7DSTDIR=$(MANDIR)/man7
+MANHTMLDIR=$(MANDIR)/html
 
 MAN1SRC=                        				 	\
 	$(MANDIR)/cdist-code-run.text					\
@@ -47,12 +50,14 @@ MAN7SRC=$(MANDIR)/cdist.text						\
    $(MANDIR)/cdist-reference.text				\
 	$(MANDIR)/cdist-stages.text					\
 	$(MANDIR)/cdist-type.text						\
-	$(shell ls conf/type/*/man.text)
+
+MAN7TYPESRC=$(shell ls conf/type/*/man.text)
 
 MAN1DST=$(MAN1SRC:.text=.1)
 MAN7DST=$(MAN7SRC:.text=.7)
 MANHTML=$(MAN1SRC:.text=.html) $(MAN7SRC:.text=.html)
 
+
 ################################################################################
 # User targets
 #
@@ -69,11 +74,15 @@ all:
 	@echo ''
 
 
-%.1 %.7: %.text
+$(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR):
+	mkdir -p $<
+
+%.1 %.7: %.text $(MAN1DSTDIR) $(MAN7DSTDIR)
 	$(A2XM) $*.text
 
 %.html: %.text
-	$(A2XH) $*.text
+	$(A2XH) -o $(MANHTMLDIR)/$(@F) $<
+	#$(A2XH) -o $(MANHTMLDIR)/$(@F) $*.text
 
 man: $(MAN1DST) $(MAN7DST)
 
@@ -91,11 +100,11 @@ manmove: $(MAN1DST) $(MAN7DST) $(MANHTML)
 	done
 
 	# HTML
-	mkdir -p $(HTMLDIR)
-	mv doc/man/*.html $(HTMLDIR)
+	mkdir -p $(MANHTMLDIR)
+	mv doc/man/*.html $(MANHTMLDIR)
 	for mantype in conf/type/*/man.html; do \
 		mannew=$$(echo $$mantype | sed -e 's;conf/;cdist-;'  -e 's;/;;' -e 's;/man;;');\
-		mv $$mantype $(HTMLDIR)/$$mannew; \
+		mv $$mantype $(MANHTMLDIR)/$$mannew; \
 	done
 
 # Reference depends on conf/type/*/man.text - HOWTO with posix make?
@@ -107,7 +116,7 @@ $(MANDIR)/cdist-reference.text: $(MANDIR)/cdist-reference.text.sh
 clean:
 	rm -rf doc/man/html/* doc/man/*.[1-9] doc/man/man[1-9]
 	rm -f conf/type/*/man.html $(MANDIR)/cdist-reference.text
-	rm -rf $(HTMLDIR)
+	rm -rf $(MANHTMLDIR)
 
 ################################################################################
 # Developer targets
@@ -124,7 +133,7 @@ test:
 web: manmove
 	cp README $(WEBDIR)/$(WEBPAGE)
 	rm -rf $(WEBDIR)/$(WEBBASE)/man && mkdir $(WEBDIR)/$(WEBBASE)/man
-	cp -r $(HTMLDIR)/* $(WEBDIR)/$(WEBBASE)/man
+	cp -r $(MANHTMLDIR)/* $(WEBDIR)/$(WEBBASE)/man
 	cd $(WEBDIR) && git add $(WEBBASE)/man
 	cd $(WEBDIR) && git commit -m "cdist update" $(WEBBASE) $(WEBPAGE)
 	cd $(WEBDIR) && make pub

From bbe4f940e37a667aa209a8134b2bdb964b2c7a7b Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Fri, 25 Mar 2011 11:34:29 +0100
Subject: [PATCH 04/17] in theory finish generation for man1 and man7 core
 cleanly

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 Makefile | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index fb6161b2..4af52565 100644
--- a/Makefile
+++ b/Makefile
@@ -53,8 +53,8 @@ MAN7SRC=$(MANDIR)/cdist.text						\
 
 MAN7TYPESRC=$(shell ls conf/type/*/man.text)
 
-MAN1DST=$(MAN1SRC:.text=.1)
-MAN7DST=$(MAN7SRC:.text=.7)
+MAN1DST=$(addprefix $(MAN1DSTDIR)/,$(notdir $(MAN1SRC:.text=.1)))
+MAN7DST=$(addprefix $(MAN7DSTDIR)/,$(notdir $(MAN7SRC:.text=.7)))
 MANHTML=$(MAN1SRC:.text=.html) $(MAN7SRC:.text=.html)
 
 
@@ -74,15 +74,27 @@ all:
 	@echo ''
 
 
-$(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR):
-	mkdir -p $<
+################################################################################
+# Documentation
+#
 
-%.1 %.7: %.text $(MAN1DSTDIR) $(MAN7DSTDIR)
+# Create output dirs
+$(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR):
+	mkdir -p $@
+
+# Link source files
+manlink: $(MAN1DSTDIR) $(MAN7DSTDIR)
+	for mansrc in $(MAN1SRC); do ln -sf $$mansrc $(MAN1DSTDIR); done
+	for mansrc in $(MAN7SRC); do ln -sf $$mansrc $(MAN7DSTDIR); done
+	for mansrc in $(MAN7TYPESRC); do \
+		dst="$$(echo $$mansrc | sed -e 's;conf/;cdist-;'  -e 's;/;;' -e 's;/man;;' -e 's;^;doc/man/man7/;')"; \
+		ln -sf $$mansrc $$dst; done
+
+%.1 %.7: %.text manlink
 	$(A2XM) $*.text
 
 %.html: %.text
 	$(A2XH) -o $(MANHTMLDIR)/$(@F) $<
-	#$(A2XH) -o $(MANHTMLDIR)/$(@F) $*.text
 
 man: $(MAN1DST) $(MAN7DST)
 

From 6e85d65b72321c849ce224b6708bb031180310ec Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Fri, 25 Mar 2011 11:35:43 +0100
Subject: [PATCH 05/17] and in practise link to .. is better than somewhere
 else

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 4af52565..d0d43073 100644
--- a/Makefile
+++ b/Makefile
@@ -84,8 +84,8 @@ $(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR):
 
 # Link source files
 manlink: $(MAN1DSTDIR) $(MAN7DSTDIR)
-	for mansrc in $(MAN1SRC); do ln -sf $$mansrc $(MAN1DSTDIR); done
-	for mansrc in $(MAN7SRC); do ln -sf $$mansrc $(MAN7DSTDIR); done
+	for mansrc in $(notdir $(MAN1SRC)); do ln -sf ../$$mansrc $(MAN1DSTDIR); done
+	for mansrc in $(notdir $(MAN7SRC)); do ln -sf ../$$mansrc $(MAN7DSTDIR); done
 	for mansrc in $(MAN7TYPESRC); do \
 		dst="$$(echo $$mansrc | sed -e 's;conf/;cdist-;'  -e 's;/;;' -e 's;/man;;' -e 's;^;doc/man/man7/;')"; \
 		ln -sf $$mansrc $$dst; done

From 3e72555e5923f9f433fd6f8dfd700cb53f8be41c Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Fri, 25 Mar 2011 11:46:56 +0100
Subject: [PATCH 06/17] make man is clean now

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index d0d43073..47d0e3df 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ MAN7SRC=$(MANDIR)/cdist.text						\
 	$(MANDIR)/cdist-type.text						\
 
 MAN7TYPESRC=$(shell ls conf/type/*/man.text)
-
+MAN7TYPEDST=$(shell for mansrc in $(MAN7TYPESRC:.text=.7); do dst="$$(echo $$mansrc | sed -e 's;conf/;cdist-;'  -e 's;/;;' -e 's;/man;;' -e 's;^;doc/man/man7/;')"; echo $$dst; done)
 MAN1DST=$(addprefix $(MAN1DSTDIR)/,$(notdir $(MAN1SRC:.text=.1)))
 MAN7DST=$(addprefix $(MAN7DSTDIR)/,$(notdir $(MAN7SRC:.text=.7)))
 MANHTML=$(MAN1SRC:.text=.html) $(MAN7SRC:.text=.html)
@@ -84,11 +84,11 @@ $(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR):
 
 # Link source files
 manlink: $(MAN1DSTDIR) $(MAN7DSTDIR)
-	for mansrc in $(notdir $(MAN1SRC)); do ln -sf ../$$mansrc $(MAN1DSTDIR); done
-	for mansrc in $(notdir $(MAN7SRC)); do ln -sf ../$$mansrc $(MAN7DSTDIR); done
+	for mansrc in $(MAN1SRC); do ln -sf ../../../$$mansrc $(MAN1DSTDIR); done
+	for mansrc in $(MAN7SRC); do ln -sf ../../../$$mansrc $(MAN7DSTDIR); done
 	for mansrc in $(MAN7TYPESRC); do \
 		dst="$$(echo $$mansrc | sed -e 's;conf/;cdist-;'  -e 's;/;;' -e 's;/man;;' -e 's;^;doc/man/man7/;')"; \
-		ln -sf $$mansrc $$dst; done
+		ln -sf ../../../$$mansrc $$dst; done
 
 %.1 %.7: %.text manlink
 	$(A2XM) $*.text
@@ -96,7 +96,7 @@ manlink: $(MAN1DSTDIR) $(MAN7DSTDIR)
 %.html: %.text
 	$(A2XH) -o $(MANHTMLDIR)/$(@F) $<
 
-man: $(MAN1DST) $(MAN7DST)
+man: $(MAN1DST) $(MAN7DST) $(MAN7TYPEDST)
 
 html: $(MANHTML)
 

From 58391818ccd6a616524b7b98417870853603c4cf Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Fri, 25 Mar 2011 11:52:51 +0100
Subject: [PATCH 07/17] remove old manmove target

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 Makefile | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index 47d0e3df..2b795740 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@ MAN7TYPESRC=$(shell ls conf/type/*/man.text)
 MAN7TYPEDST=$(shell for mansrc in $(MAN7TYPESRC:.text=.7); do dst="$$(echo $$mansrc | sed -e 's;conf/;cdist-;'  -e 's;/;;' -e 's;/man;;' -e 's;^;doc/man/man7/;')"; echo $$dst; done)
 MAN1DST=$(addprefix $(MAN1DSTDIR)/,$(notdir $(MAN1SRC:.text=.1)))
 MAN7DST=$(addprefix $(MAN7DSTDIR)/,$(notdir $(MAN7SRC:.text=.7)))
-MANHTML=$(MAN1SRC:.text=.html) $(MAN7SRC:.text=.html)
+MANHTML=$(MAN1DST:.1=.html) $(MAN7DST:.7=.html) $(MAN7TYPEDST:.7=.html)
 
 
 ################################################################################
@@ -83,7 +83,7 @@ $(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR):
 	mkdir -p $@
 
 # Link source files
-manlink: $(MAN1DSTDIR) $(MAN7DSTDIR)
+manlink: $(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR)
 	for mansrc in $(MAN1SRC); do ln -sf ../../../$$mansrc $(MAN1DSTDIR); done
 	for mansrc in $(MAN7SRC); do ln -sf ../../../$$mansrc $(MAN7DSTDIR); done
 	for mansrc in $(MAN7TYPESRC); do \
@@ -100,25 +100,6 @@ man: $(MAN1DST) $(MAN7DST) $(MAN7TYPEDST)
 
 html: $(MANHTML)
 
-# man: doc/man/.marker
-
-# Move into manpath directories
-manmove: $(MAN1DST) $(MAN7DST) $(MANHTML)
-	for manpage in $(MANDIR)/*.[1-9] conf/type/*/*.7; do \
-		cat=$${manpage##*.}; \
-		mandir=$(MANDIR)/man$$cat; \
-		mkdir -p $$mandir; \
-		mv $$manpage $$mandir; \
-	done
-
-	# HTML
-	mkdir -p $(MANHTMLDIR)
-	mv doc/man/*.html $(MANHTMLDIR)
-	for mantype in conf/type/*/man.html; do \
-		mannew=$$(echo $$mantype | sed -e 's;conf/;cdist-;'  -e 's;/;;' -e 's;/man;;');\
-		mv $$mantype $(MANHTMLDIR)/$$mannew; \
-	done
-
 # Reference depends on conf/type/*/man.text - HOWTO with posix make?
 $(MANDIR)/cdist-reference.text: $(MANDIR)/cdist-reference.text.sh
 	$(MANDIR)/cdist-reference.text.sh

From bd25d6810b836552a245677c8189e0ddcd4293fa Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Fri, 25 Mar 2011 19:39:50 +0100
Subject: [PATCH 08/17] makefile cleanup, todo add

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 Makefile            | 11 ++++++-----
 doc/dev/todo/TAKEME |  9 ++++++++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 2b795740..3de70201 100644
--- a/Makefile
+++ b/Makefile
@@ -69,6 +69,7 @@ all:
 	@echo 'Here are the possible targets:'
 	@echo ''
 	@echo '	man: Build manpages (requires Asciidoc)'
+	@echo '	manhtml: Build html-manpages (requires Asciidoc)'
 	@echo '	clean: Remove build stuff'
 	@echo ''
 	@echo ''
@@ -83,7 +84,7 @@ $(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR):
 	mkdir -p $@
 
 # Link source files
-manlink: $(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR)
+manlink: $(MAN1SRC) $(MAN7SRC) $(MANTYPE7SRC) $(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR)
 	for mansrc in $(MAN1SRC); do ln -sf ../../../$$mansrc $(MAN1DSTDIR); done
 	for mansrc in $(MAN7SRC); do ln -sf ../../../$$mansrc $(MAN7DSTDIR); done
 	for mansrc in $(MAN7TYPESRC); do \
@@ -93,14 +94,14 @@ manlink: $(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR)
 %.1 %.7: %.text manlink
 	$(A2XM) $*.text
 
-%.html: %.text
+%.html: %.text manlink
 	$(A2XH) -o $(MANHTMLDIR)/$(@F) $<
 
 man: $(MAN1DST) $(MAN7DST) $(MAN7TYPEDST)
 
-html: $(MANHTML)
+# $(MANHTML): $(MANHTMLDIR)
+manhtml: $(MANHTML)
 
-# Reference depends on conf/type/*/man.text - HOWTO with posix make?
 $(MANDIR)/cdist-reference.text: $(MANDIR)/cdist-reference.text.sh
 	$(MANDIR)/cdist-reference.text.sh
 	$(A2XM) $(MANDIR)/cdist-reference.text
@@ -109,7 +110,7 @@ $(MANDIR)/cdist-reference.text: $(MANDIR)/cdist-reference.text.sh
 clean:
 	rm -rf doc/man/html/* doc/man/*.[1-9] doc/man/man[1-9]
 	rm -f conf/type/*/man.html $(MANDIR)/cdist-reference.text
-	rm -rf $(MANHTMLDIR)
+	rm -rf $(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR)
 
 ################################################################################
 # Developer targets
diff --git a/doc/dev/todo/TAKEME b/doc/dev/todo/TAKEME
index 9fa083cc..2881c06c 100644
--- a/doc/dev/todo/TAKEME
+++ b/doc/dev/todo/TAKEME
@@ -1,7 +1,14 @@
+UNASSIGNED TODOS
+----------------
 The following list of todos has not been assigned to any developer.
+Feel free to pick one!
 
-Feel free to pick one:
+CORE
+----
+Only build manpages if necessary for types as well as for the core!
 
+TYPES
+------
 Types to be written/extended:
    - __ssh-keys (host/user)
    - Think about __service - necessary?

From 1a2f7bb8bb3df13ed9ae81c089eb31684e186e66 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Fri, 25 Mar 2011 20:31:20 +0100
Subject: [PATCH 09/17] link type manpages into tempdir

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 Makefile | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 3de70201..b09d5719 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,8 @@ MANDIR=doc/man
 MAN1DSTDIR=$(MANDIR)/man1
 MAN7DSTDIR=$(MANDIR)/man7
 MANHTMLDIR=$(MANDIR)/html
+MANTMPDIR=$(MANDIR)/tmp
+MANOUTDIRS=$(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR)
 
 MAN1SRC=                        				 	\
 	$(MANDIR)/cdist-code-run.text					\
@@ -79,8 +81,18 @@ all:
 # Documentation
 #
 
+# Type manpages are in no good format for asciidoc, make them look good!
+manlinktypes: $(MANTMPDIR)
+	for mansrc in $(MAN7TYPESRC); do \
+		dst="$$(echo $$mansrc | sed -e 's;conf/;cdist-;'  -e 's;/;;' -e 's;/man;;' -e 's;^;$(MANTMPDIR)/;')"; \
+		ln -sf ../../../$$mansrc $$dst; done
+
+################################################################################
+
+man: $(MAN1DST) $(MAN7DST) $(MAN7TYPEDST)
+
 # Create output dirs
-$(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR):
+$(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR) $(MANTMPDIR):
 	mkdir -p $@
 
 # Link source files
@@ -91,14 +103,12 @@ manlink: $(MAN1SRC) $(MAN7SRC) $(MANTYPE7SRC) $(MAN1DSTDIR) $(MAN7DSTDIR) $(MANH
 		dst="$$(echo $$mansrc | sed -e 's;conf/;cdist-;'  -e 's;/;;' -e 's;/man;;' -e 's;^;doc/man/man7/;')"; \
 		ln -sf ../../../$$mansrc $$dst; done
 
-%.1 %.7: %.text manlink
+%.1 %.7: %.text manlink $(MANOUTDIRS)
 	$(A2XM) $*.text
 
 %.html: %.text manlink
 	$(A2XH) -o $(MANHTMLDIR)/$(@F) $<
 
-man: $(MAN1DST) $(MAN7DST) $(MAN7TYPEDST)
-
 # $(MANHTML): $(MANHTMLDIR)
 manhtml: $(MANHTML)
 

From 1398cde9f0f29f33420439ef608f50fe3d4a8e8d Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Fri, 25 Mar 2011 20:34:13 +0100
Subject: [PATCH 10/17] also link core manpages into tmp

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b09d5719..79188352 100644
--- a/Makefile
+++ b/Makefile
@@ -82,10 +82,12 @@ all:
 #
 
 # Type manpages are in no good format for asciidoc, make them look good!
-manlinktypes: $(MANTMPDIR)
+manlink: $(MANTMPDIR)
 	for mansrc in $(MAN7TYPESRC); do \
 		dst="$$(echo $$mansrc | sed -e 's;conf/;cdist-;'  -e 's;/;;' -e 's;/man;;' -e 's;^;$(MANTMPDIR)/;')"; \
 		ln -sf ../../../$$mansrc $$dst; done
+	for mansrc in $(MAN1SRC); do ln -sf ../../../$$mansrc $(MANTMPDIR); done
+	for mansrc in $(MAN7SRC); do ln -sf ../../../$$mansrc $(MANTMPDIR); done
 
 ################################################################################
 

From 8c3782f091db1bcba723bf72d4f244d8d185fa60 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Fri, 25 Mar 2011 20:49:09 +0100
Subject: [PATCH 11/17] further cleanups to the man build system

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 Makefile | 52 +++++++++++++++++++++-------------------------------
 1 file changed, 21 insertions(+), 31 deletions(-)

diff --git a/Makefile b/Makefile
index 79188352..e06db5c0 100644
--- a/Makefile
+++ b/Makefile
@@ -5,23 +5,20 @@ MANDIR=$(PREFIX)/share/man
 
 # Manpage and HTML
 A2XM=a2x -f manpage --no-xmllint
-# A2XH=a2x -f xhtml --no-xmllint
-A2XH=asciidoc -b xhtml11
+A2XH=a2x -f xhtml --no-xmllint
 
-# Developer only
+# Developer webbase
 WEBDIR=$$HOME/niconetz
 WEBBASE=software/cdist
 WEBPAGE=$(WEBBASE).mdwn
 
-
 # Documentation
 MANDIR=doc/man
 
 MAN1DSTDIR=$(MANDIR)/man1
 MAN7DSTDIR=$(MANDIR)/man7
 MANHTMLDIR=$(MANDIR)/html
-MANTMPDIR=$(MANDIR)/tmp
-MANOUTDIRS=$(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR)
+MANOUTDIRS=$(MAN1DSTDIR) $(MAN7DSTDIR)
 
 MAN1SRC=                        				 	\
 	$(MANDIR)/cdist-code-run.text					\
@@ -53,12 +50,17 @@ MAN7SRC=$(MANDIR)/cdist.text						\
 	$(MANDIR)/cdist-stages.text					\
 	$(MANDIR)/cdist-type.text						\
 
+# Manpages from types
 MAN7TYPESRC=$(shell ls conf/type/*/man.text)
-MAN7TYPEDST=$(shell for mansrc in $(MAN7TYPESRC:.text=.7); do dst="$$(echo $$mansrc | sed -e 's;conf/;cdist-;'  -e 's;/;;' -e 's;/man;;' -e 's;^;doc/man/man7/;')"; echo $$dst; done)
-MAN1DST=$(addprefix $(MAN1DSTDIR)/,$(notdir $(MAN1SRC:.text=.1)))
-MAN7DST=$(addprefix $(MAN7DSTDIR)/,$(notdir $(MAN7SRC:.text=.7)))
-MANHTML=$(MAN1DST:.1=.html) $(MAN7DST:.7=.html) $(MAN7TYPEDST:.7=.html)
 
+# Source files after linking them
+MAN1TMPSRC=$(shell ls $(MAN1DSTDIR)/*.text)
+MAN7TMPSRC=$(shell ls $(MAN7DSTDIR)/*.text)
+
+# Destination files based on linked files, not static list
+MAN1DST=$(MAN1TMPSRC:.text=.1)
+MAN7DST=$(MAN7TMPSRC:.text=.7)
+MANHTML=$(MAN1TMPSRC:.text=.html) $(MAN7TMPSRC:.text=.html)
 
 ################################################################################
 # User targets
@@ -81,48 +83,36 @@ all:
 # Documentation
 #
 
-# Type manpages are in no good format for asciidoc, make them look good!
-manlink: $(MANTMPDIR)
-	for mansrc in $(MAN7TYPESRC); do \
-		dst="$$(echo $$mansrc | sed -e 's;conf/;cdist-;'  -e 's;/;;' -e 's;/man;;' -e 's;^;$(MANTMPDIR)/;')"; \
-		ln -sf ../../../$$mansrc $$dst; done
-	for mansrc in $(MAN1SRC); do ln -sf ../../../$$mansrc $(MANTMPDIR); done
-	for mansrc in $(MAN7SRC); do ln -sf ../../../$$mansrc $(MANTMPDIR); done
+# Create manpages
+man: $(MAN1DST) $(MAN7DST)
+manhtml: $(MANHTML)
 
-################################################################################
-
-man: $(MAN1DST) $(MAN7DST) $(MAN7TYPEDST)
+$(MANHTML): $(MANHTMLDIR)
 
 # Create output dirs
 $(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR) $(MANTMPDIR):
 	mkdir -p $@
 
 # Link source files
-manlink: $(MAN1SRC) $(MAN7SRC) $(MANTYPE7SRC) $(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR)
+manlink: $(MAN1SRC) $(MAN7SRC) $(MANTYPE7SRC) $(MANOUTDIRS)
 	for mansrc in $(MAN1SRC); do ln -sf ../../../$$mansrc $(MAN1DSTDIR); done
 	for mansrc in $(MAN7SRC); do ln -sf ../../../$$mansrc $(MAN7DSTDIR); done
 	for mansrc in $(MAN7TYPESRC); do \
 		dst="$$(echo $$mansrc | sed -e 's;conf/;cdist-;'  -e 's;/;;' -e 's;/man;;' -e 's;^;doc/man/man7/;')"; \
 		ln -sf ../../../$$mansrc $$dst; done
 
-%.1 %.7: %.text manlink $(MANOUTDIRS)
+%.1 %.7: %.text manlink
 	$(A2XM) $*.text
 
 %.html: %.text manlink
-	$(A2XH) -o $(MANHTMLDIR)/$(@F) $<
-
-# $(MANHTML): $(MANHTMLDIR)
-manhtml: $(MANHTML)
+	$(A2XH) $<
 
 $(MANDIR)/cdist-reference.text: $(MANDIR)/cdist-reference.text.sh
 	$(MANDIR)/cdist-reference.text.sh
-	$(A2XM) $(MANDIR)/cdist-reference.text
-	$(A2XH) $(MANDIR)/cdist-reference.text
 	
 clean:
-	rm -rf doc/man/html/* doc/man/*.[1-9] doc/man/man[1-9]
-	rm -f conf/type/*/man.html $(MANDIR)/cdist-reference.text
-	rm -rf $(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR)
+	rm -rf $(MANOUTDIRS)
+	rm -f  $(MANDIR)/cdist-reference.text
 
 ################################################################################
 # Developer targets

From 8a01df66dd8b7202a7e604f12f81bb47a3eee565 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Fri, 25 Mar 2011 20:54:50 +0100
Subject: [PATCH 12/17] does not work: MAN1TMPSRC=$(shell ls
 $(MAN1DSTDIR)/*.text) is expanded before manlink was run

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e06db5c0..fc55ea03 100644
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,7 @@ all:
 man: $(MAN1DST) $(MAN7DST)
 manhtml: $(MANHTML)
 
-$(MANHTML): $(MANHTMLDIR)
+$(MAN1DST) $(MAN7DST) $(MANHTML): $(MANOUTDIRS)
 
 # Create output dirs
 $(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR) $(MANTMPDIR):

From 4d33e524a122745c8d62eb0015cd4b9ef46d4092 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Fri, 25 Mar 2011 20:56:25 +0100
Subject: [PATCH 13/17] begin to migrate makefile to shell script

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 Makefile => build.sh | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)
 rename Makefile => build.sh (80%)

diff --git a/Makefile b/build.sh
similarity index 80%
rename from Makefile
rename to build.sh
index fc55ea03..f8544f09 100644
--- a/Makefile
+++ b/build.sh
@@ -1,7 +1,27 @@
-# General
-PREFIX=/usr
-BINDIR=$(PREFIX)/bin
-MANDIR=$(PREFIX)/share/man
+#!/bin/sh
+#
+# 2011 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Push a directory to a target, both sides have the same name (i.e. explorers)
+# or
+# Pull a directory from a target, both sides have the same name (i.e. explorers)
+#
 
 # Manpage and HTML
 A2XM=a2x -f manpage --no-xmllint
@@ -17,7 +37,6 @@ MANDIR=doc/man
 
 MAN1DSTDIR=$(MANDIR)/man1
 MAN7DSTDIR=$(MANDIR)/man7
-MANHTMLDIR=$(MANDIR)/html
 MANOUTDIRS=$(MAN1DSTDIR) $(MAN7DSTDIR)
 
 MAN1SRC=                        				 	\

From 8b9b95f98479c3002c9ca13da9ff8295f9d3d4ef Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Fri, 25 Mar 2011 21:04:26 +0100
Subject: [PATCH 14/17] partial transformation

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 build.sh | 156 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 84 insertions(+), 72 deletions(-)
 mode change 100644 => 100755 build.sh

diff --git a/build.sh b/build.sh
old mode 100644
new mode 100755
index f8544f09..8509eddc
--- a/build.sh
+++ b/build.sh
@@ -24,57 +24,98 @@
 #
 
 # Manpage and HTML
-A2XM=a2x -f manpage --no-xmllint
-A2XH=a2x -f xhtml --no-xmllint
+A2XM="a2x -f manpage --no-xmllint"
+A2XH="a2x -f xhtml --no-xmllint"
 
 # Developer webbase
-WEBDIR=$$HOME/niconetz
+WEBDIR=$HOME/niconetz
 WEBBASE=software/cdist
-WEBPAGE=$(WEBBASE).mdwn
+WEBPAGE=${WEBBASE}.mdwn
 
 # Documentation
 MANDIR=doc/man
-
-MAN1DSTDIR=$(MANDIR)/man1
-MAN7DSTDIR=$(MANDIR)/man7
-MANOUTDIRS=$(MAN1DSTDIR) $(MAN7DSTDIR)
+MAN1DSTDIR=${MANDIR}/man1
+MAN7DSTDIR=${MANDIR}/man7
 
 MAN1SRC=                        				 	\
-	$(MANDIR)/cdist-code-run.text					\
-	$(MANDIR)/cdist-code-run-all.text			\
-	$(MANDIR)/cdist-config.text 					\
-   $(MANDIR)/cdist-dir.text         			\
-   $(MANDIR)/cdist-env.text         			\
-   $(MANDIR)/cdist-explorer-run-global.text 	\
-   $(MANDIR)/cdist-deploy-to.text 				\
-	$(MANDIR)/cdist-explorer.text					\
-	$(MANDIR)/cdist-manifest.text 				\
-	$(MANDIR)/cdist-manifest-run.text			\
-   $(MANDIR)/cdist-manifest-run-init.text		\
-   $(MANDIR)/cdist-manifest-run-all.text	 	\
-	$(MANDIR)/cdist-object-explorer-all.text	\
-	$(MANDIR)/cdist-object-gencode.text    	\
-	$(MANDIR)/cdist-object-gencode-all.text	\
-   $(MANDIR)/cdist-remote-explorer-run.text 	\
-	$(MANDIR)/cdist-run-remote.text				\
-	$(MANDIR)/cdist-type-build-emulation.text \
-	$(MANDIR)/cdist-type-emulator.text			\
-	$(MANDIR)/cdist-type-template.text			\
+	${MANDIR}/cdist-code-run.text					\
+	${MANDIR}/cdist-code-run-all.text			\
+	${MANDIR}/cdist-config.text 					\
+   ${MANDIR}/cdist-dir.text         			\
+   ${MANDIR}/cdist-env.text         			\
+   ${MANDIR}/cdist-explorer-run-global.text 	\
+   ${MANDIR}/cdist-deploy-to.text 				\
+	${MANDIR}/cdist-explorer.text					\
+	${MANDIR}/cdist-manifest.text 				\
+	${MANDIR}/cdist-manifest-run.text			\
+   ${MANDIR}/cdist-manifest-run-init.text		\
+   ${MANDIR}/cdist-manifest-run-all.text	 	\
+	${MANDIR}/cdist-object-explorer-all.text	\
+	${MANDIR}/cdist-object-gencode.text    	\
+	${MANDIR}/cdist-object-gencode-all.text	\
+   ${MANDIR}/cdist-remote-explorer-run.text 	\
+	${MANDIR}/cdist-run-remote.text				\
+	${MANDIR}/cdist-type-build-emulation.text \
+	${MANDIR}/cdist-type-emulator.text			\
+	${MANDIR}/cdist-type-template.text
+
+MAN7SRC=${MANDIR}/cdist.text						\
+	${MANDIR}/cdist-best-practise.text			\
+	${MANDIR}/cdist-hacker.text  					\
+	${MANDIR}/cdist-quickstart.text 				\
+   ${MANDIR}/cdist-reference.text				\
+	${MANDIR}/cdist-stages.text					\
+	${MANDIR}/cdist-type.text						\
+
+
+case "$1" in
+   man)
+	   for mansrc in ${MAN1SRC} ${MAN7SRC}; do
+         ln -sf ../../../$mansrc ${MAN1DSTDIR};
+      done
+	   for mansrc in ${MAN7TYPESRC}; do
+         dst="$(echo $mansrc | sed -e 's;conf/;cdist-;'  -e 's;/;;' -e 's;/man;;' -e 's;^;doc/man/man7/;')"
+         ln -sf ../../../$$mansrc $$dst
+      done
+   ;;
+
+   web)
+      cp README ${WEBDIR}/${WEBPAGE}
+      rm -rf ${WEBDIR}/${WEBBASE}/man && mkdir ${WEBDIR}/${WEBBASE}/man
+      cp -r $(MANHTMLDIR)/* ${WEBDIR}/${WEBBASE}/man
+      cd ${WEBDIR} && git add ${WEBBASE}/man
+      cd ${WEBDIR} && git commit -m "cdist update" ${WEBBASE} ${WEBPAGE}
+      cd ${WEBDIR} && make pub
+   ;;
+
+   pub)
+      git push --mirror
+      git push --mirror github
+   ;;
+
+   *)
+      echo ''
+      echo 'Welcome to cdist!'
+      echo ''
+      echo 'Here are the possible targets:'
+      echo ''
+      echo '	man: Build manpages (requires Asciidoc)'
+      echo '	manhtml: Build html-manpages (requires Asciidoc)'
+      echo '	clean: Remove build stuff'
+      echo ''
+      echo ''
+      echo "Unknown target, \"$1\"" >&2
+      exit 1
+   ;;
+esac
 
-MAN7SRC=$(MANDIR)/cdist.text						\
-	$(MANDIR)/cdist-best-practise.text			\
-	$(MANDIR)/cdist-hacker.text  					\
-	$(MANDIR)/cdist-quickstart.text 				\
-   $(MANDIR)/cdist-reference.text				\
-	$(MANDIR)/cdist-stages.text					\
-	$(MANDIR)/cdist-type.text						\
 
 # Manpages from types
-MAN7TYPESRC=$(shell ls conf/type/*/man.text)
+MAN7TYPESRC=$(ls conf/type/*/man.text)
 
 # Source files after linking them
-MAN1TMPSRC=$(shell ls $(MAN1DSTDIR)/*.text)
-MAN7TMPSRC=$(shell ls $(MAN7DSTDIR)/*.text)
+MAN1TMPSRC=$(shell ls ${MAN1DSTDIR}/*.text)
+MAN7TMPSRC=$(shell ls ${MAN7DSTDIR}/*.text)
 
 # Destination files based on linked files, not static list
 MAN1DST=$(MAN1TMPSRC:.text=.1)
@@ -85,18 +126,6 @@ MANHTML=$(MAN1TMPSRC:.text=.html) $(MAN7TMPSRC:.text=.html)
 # User targets
 #
 
-all:
-	@echo ''
-	@echo 'Welcome to cdist!'
-	@echo ''
-	@echo 'Here are the possible targets:'
-	@echo ''
-	@echo '	man: Build manpages (requires Asciidoc)'
-	@echo '	manhtml: Build html-manpages (requires Asciidoc)'
-	@echo '	clean: Remove build stuff'
-	@echo ''
-	@echo ''
-
 
 ################################################################################
 # Documentation
@@ -109,16 +138,11 @@ manhtml: $(MANHTML)
 $(MAN1DST) $(MAN7DST) $(MANHTML): $(MANOUTDIRS)
 
 # Create output dirs
-$(MAN1DSTDIR) $(MAN7DSTDIR) $(MANHTMLDIR) $(MANTMPDIR):
+${MAN1DSTDIR} ${MAN7DSTDIR} $(MANHTMLDIR) $(MANTMPDIR):
 	mkdir -p $@
 
 # Link source files
-manlink: $(MAN1SRC) $(MAN7SRC) $(MANTYPE7SRC) $(MANOUTDIRS)
-	for mansrc in $(MAN1SRC); do ln -sf ../../../$$mansrc $(MAN1DSTDIR); done
-	for mansrc in $(MAN7SRC); do ln -sf ../../../$$mansrc $(MAN7DSTDIR); done
-	for mansrc in $(MAN7TYPESRC); do \
-		dst="$$(echo $$mansrc | sed -e 's;conf/;cdist-;'  -e 's;/;;' -e 's;/man;;' -e 's;^;doc/man/man7/;')"; \
-		ln -sf ../../../$$mansrc $$dst; done
+manlink: ${MAN1SRC} ${MAN7SRC} $(MANTYPE7SRC) $(MANOUTDIRS)
 
 %.1 %.7: %.text manlink
 	$(A2XM) $*.text
@@ -126,12 +150,12 @@ manlink: $(MAN1SRC) $(MAN7SRC) $(MANTYPE7SRC) $(MANOUTDIRS)
 %.html: %.text manlink
 	$(A2XH) $<
 
-$(MANDIR)/cdist-reference.text: $(MANDIR)/cdist-reference.text.sh
-	$(MANDIR)/cdist-reference.text.sh
+${MANDIR}/cdist-reference.text: ${MANDIR}/cdist-reference.text.sh
+	${MANDIR}/cdist-reference.text.sh
 	
 clean:
 	rm -rf $(MANOUTDIRS)
-	rm -f  $(MANDIR)/cdist-reference.text
+	rm -f  ${MANDIR}/cdist-reference.text
 
 ################################################################################
 # Developer targets
@@ -144,15 +168,3 @@ test:
 	.rsync nicosc@free.ethz.ch:cdist
 	# gentoo
 	.rsync nicosc@ru3.inf.ethz.ch:cdist
-
-web: manmove
-	cp README $(WEBDIR)/$(WEBPAGE)
-	rm -rf $(WEBDIR)/$(WEBBASE)/man && mkdir $(WEBDIR)/$(WEBBASE)/man
-	cp -r $(MANHTMLDIR)/* $(WEBDIR)/$(WEBBASE)/man
-	cd $(WEBDIR) && git add $(WEBBASE)/man
-	cd $(WEBDIR) && git commit -m "cdist update" $(WEBBASE) $(WEBPAGE)
-	cd $(WEBDIR) && make pub
-
-pub:
-	git push --mirror
-	git push --mirror github

From 88ca7a44ec5180034afb31ce816d690fdbf5f47a Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Fri, 25 Mar 2011 22:10:52 +0100
Subject: [PATCH 15/17] finish most parts of translation

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 build.sh | 157 +++++++++++++++++++++----------------------------------
 1 file changed, 59 insertions(+), 98 deletions(-)

diff --git a/build.sh b/build.sh
index 8509eddc..cf0574fd 100755
--- a/build.sh
+++ b/build.sh
@@ -37,55 +37,71 @@ MANDIR=doc/man
 MAN1DSTDIR=${MANDIR}/man1
 MAN7DSTDIR=${MANDIR}/man7
 
-MAN1SRC=                        				 	\
-	${MANDIR}/cdist-code-run.text					\
-	${MANDIR}/cdist-code-run-all.text			\
-	${MANDIR}/cdist-config.text 					\
-   ${MANDIR}/cdist-dir.text         			\
-   ${MANDIR}/cdist-env.text         			\
-   ${MANDIR}/cdist-explorer-run-global.text 	\
-   ${MANDIR}/cdist-deploy-to.text 				\
-	${MANDIR}/cdist-explorer.text					\
-	${MANDIR}/cdist-manifest.text 				\
-	${MANDIR}/cdist-manifest-run.text			\
-   ${MANDIR}/cdist-manifest-run-init.text		\
-   ${MANDIR}/cdist-manifest-run-all.text	 	\
-	${MANDIR}/cdist-object-explorer-all.text	\
-	${MANDIR}/cdist-object-gencode.text    	\
-	${MANDIR}/cdist-object-gencode-all.text	\
-   ${MANDIR}/cdist-remote-explorer-run.text 	\
-	${MANDIR}/cdist-run-remote.text				\
-	${MANDIR}/cdist-type-build-emulation.text \
-	${MANDIR}/cdist-type-emulator.text			\
-	${MANDIR}/cdist-type-template.text
-
-MAN7SRC=${MANDIR}/cdist.text						\
-	${MANDIR}/cdist-best-practise.text			\
-	${MANDIR}/cdist-hacker.text  					\
-	${MANDIR}/cdist-quickstart.text 				\
-   ${MANDIR}/cdist-reference.text				\
-	${MANDIR}/cdist-stages.text					\
-	${MANDIR}/cdist-type.text						\
-
-
 case "$1" in
    man)
-	   for mansrc in ${MAN1SRC} ${MAN7SRC}; do
-         ln -sf ../../../$mansrc ${MAN1DSTDIR};
+      set -e
+      "$0" mandirs
+      "$0" mantype
+      "$0" man1
+      "$0" man7
+      "$0" manbuild
+   ;;
+
+   manbuild)
+      for src in ${MAN1DSTDIR}/*.text ${MAN7DSTDIR}/*.text; do
+         echo "Compiling manpage and html for $src"
+         $A2XM "$src"
+         $A2XH "$src"
       done
+   ;;
+
+   mandirs)
+      # Create destination directories
+      mkdir -p "${MAN1DSTDIR}" "${MAN7DSTDIR}"
+   ;;
+
+   mantype)
 	   for mansrc in ${MAN7TYPESRC}; do
          dst="$(echo $mansrc | sed -e 's;conf/;cdist-;'  -e 's;/;;' -e 's;/man;;' -e 's;^;doc/man/man7/;')"
-         ln -sf ../../../$$mansrc $$dst
+         ln -sf "../../../$mansrc" "$dst"
       done
    ;;
 
+   man1)
+      for man in cdist-code-run.text cdist-code-run-all.text cdist-config.text \
+         cdist-dir.text cdist-env.text cdist-explorer-run-global.text          \
+         cdist-deploy-to.text cdist-explorer.text cdist-manifest.text          \
+         cdist-manifest-run.text cdist-manifest-run-init.text                  \
+         cdist-manifest-run-all.text cdist-object-explorer-all.text            \
+         cdist-object-gencode.text cdist-object-gencode-all.text               \
+         cdist-remote-explorer-run.text cdist-run-remote.text                  \
+         cdist-type-build-emulation.text cdist-type-emulator.text              \
+         cdist-type-template.text
+         do
+         ln -sf ../$man ${MAN1DSTDIR}
+      done
+   ;;
+
+   man7)
+      for man in cdist.text cdist-best-practise.text cdist-hacker.text         \
+      cdist-quickstart.text cdist-reference.text cdist-stages.text             \
+      cdist-type.text
+         do
+         ln -sf ../$man ${MAN7DSTDIR}
+      done
+   ;;
+
+   mangen)
+      ${MANDIR}/cdist-reference.text.sh
+   ;;
+
    web)
       cp README ${WEBDIR}/${WEBPAGE}
       rm -rf ${WEBDIR}/${WEBBASE}/man && mkdir ${WEBDIR}/${WEBBASE}/man
-      cp -r $(MANHTMLDIR)/* ${WEBDIR}/${WEBBASE}/man
-      cd ${WEBDIR} && git add ${WEBBASE}/man
-      cd ${WEBDIR} && git commit -m "cdist update" ${WEBBASE} ${WEBPAGE}
-      cd ${WEBDIR} && make pub
+      cp -r ${MANHTMLDIR}/* ${WEBDIR}/${WEBBASE}/man
+      cd ${WEBDIR} && echo git add ${WEBBASE}/man
+      cd ${WEBDIR} && echo git commit -m "cdist update" ${WEBBASE} ${WEBPAGE}
+      cd ${WEBDIR} && echo make pub
    ;;
 
    pub)
@@ -93,6 +109,11 @@ case "$1" in
       git push --mirror github
    ;;
 
+   clean)
+      rm -rf "$MAN1DSTDIR" "$MAN7DSTDIR"
+      rm -f  ${MANDIR}/cdist-reference.text
+   ;;
+
    *)
       echo ''
       echo 'Welcome to cdist!'
@@ -108,63 +129,3 @@ case "$1" in
       exit 1
    ;;
 esac
-
-
-# Manpages from types
-MAN7TYPESRC=$(ls conf/type/*/man.text)
-
-# Source files after linking them
-MAN1TMPSRC=$(shell ls ${MAN1DSTDIR}/*.text)
-MAN7TMPSRC=$(shell ls ${MAN7DSTDIR}/*.text)
-
-# Destination files based on linked files, not static list
-MAN1DST=$(MAN1TMPSRC:.text=.1)
-MAN7DST=$(MAN7TMPSRC:.text=.7)
-MANHTML=$(MAN1TMPSRC:.text=.html) $(MAN7TMPSRC:.text=.html)
-
-################################################################################
-# User targets
-#
-
-
-################################################################################
-# Documentation
-#
-
-# Create manpages
-man: $(MAN1DST) $(MAN7DST)
-manhtml: $(MANHTML)
-
-$(MAN1DST) $(MAN7DST) $(MANHTML): $(MANOUTDIRS)
-
-# Create output dirs
-${MAN1DSTDIR} ${MAN7DSTDIR} $(MANHTMLDIR) $(MANTMPDIR):
-	mkdir -p $@
-
-# Link source files
-manlink: ${MAN1SRC} ${MAN7SRC} $(MANTYPE7SRC) $(MANOUTDIRS)
-
-%.1 %.7: %.text manlink
-	$(A2XM) $*.text
-
-%.html: %.text manlink
-	$(A2XH) $<
-
-${MANDIR}/cdist-reference.text: ${MANDIR}/cdist-reference.text.sh
-	${MANDIR}/cdist-reference.text.sh
-	
-clean:
-	rm -rf $(MANOUTDIRS)
-	rm -f  ${MANDIR}/cdist-reference.text
-
-################################################################################
-# Developer targets
-#
-
-test:
-	# ubuntu
-	.rsync lyni@tablett:cdist
-	# redhat
-	.rsync nicosc@free.ethz.ch:cdist
-	# gentoo
-	.rsync nicosc@ru3.inf.ethz.ch:cdist

From 683e813ce22da3ff76933dff093710e16a104db7 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Fri, 25 Mar 2011 22:13:07 +0100
Subject: [PATCH 16/17] adjust web target

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 build.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.sh b/build.sh
index cf0574fd..2c1570f5 100755
--- a/build.sh
+++ b/build.sh
@@ -98,10 +98,10 @@ case "$1" in
    web)
       cp README ${WEBDIR}/${WEBPAGE}
       rm -rf ${WEBDIR}/${WEBBASE}/man && mkdir ${WEBDIR}/${WEBBASE}/man
-      cp -r ${MANHTMLDIR}/* ${WEBDIR}/${WEBBASE}/man
-      cd ${WEBDIR} && echo git add ${WEBBASE}/man
-      cd ${WEBDIR} && echo git commit -m "cdist update" ${WEBBASE} ${WEBPAGE}
-      cd ${WEBDIR} && echo make pub
+      cp ${MAN1DSTDIR}/*.html ${MAN7DSTDIR}/*.html ${WEBDIR}/${WEBBASE}/man
+      cd ${WEBDIR} && git add ${WEBBASE}/man
+      cd ${WEBDIR} && git commit -m "cdist update" ${WEBBASE} ${WEBPAGE}
+      cd ${WEBDIR} && make pub
    ;;
 
    pub)

From 3356564c7772bfc1202aed4957663a23ce2b60e7 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Fri, 25 Mar 2011 22:24:02 +0100
Subject: [PATCH 17/17] upgrade to 1.4.1

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 bin/cdist-config | 2 +-
 doc/changelog    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/cdist-config b/bin/cdist-config
index 00872438..86039f00 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -19,7 +19,7 @@
 #
 #
 
-__cdist_version="1.4.0"
+__cdist_version="1.4.1"
 
 # Fail if something bogus is going on
 set -u
diff --git a/doc/changelog b/doc/changelog
index fb0bb1f9..5cfae26f 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -1,4 +1,4 @@
-1.4.1:
+1.4.1: 2011-03-25
 	* New type __key_value (Steven Armstrong)
 	* New type __apt_ppa (Steven Armstrong)
 	* Documentation: Manpage generation cleanup