From a58ba2e1cf27ee19e687f8da47f72b58af7a01b5 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@hydrogenium.schottelius.org>
Date: Fri, 12 May 2006 15:41:49 +0200
Subject: [PATCH] [NEW] Texinfo support, Docbook support

Some more documentation formats. Perhaps ccollect wants to become
a GNU package?
---
 Makefile    | 19 +++++++++++++++----
 ccollect.sh |  2 +-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 701f08f..02ef1f2 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,8 @@
 INSTALL=install
 CCOLLECT=ccollect.sh
 LN=ln -sf
+ASCIIDOC=asciidoc
+DOCBOOKTOTEXI=docbook2x-texi
 
 prefix=/usr/packages/ccollect-git
 bindir=$(prefix)/bin
@@ -33,10 +35,19 @@ install-link: install-script
 install-script:
 	$(INSTALL) -D -m 0755 -s $(CCOLLECT) $(destination)
 
-documentation:
-	@echo "Generating HTML-documentation (de en) ..."
-	@asciidoc -n -o doc/ccollect.html  doc/ccollect.text
-	@asciidoc -n -o doc/ccollect-DE.html  doc/ccollect-DE.text
+documentation: doc/ccollect.html doc/ccollect-DE.html
+	@echo "Generated documentation"
+#	@asciidoc -n -o doc/ccollect.html  doc/ccollect.text
+#	@asciidoc -n -o doc/ccollect-DE.html  doc/ccollect-DE.text
+
+%.html: %.text
+	${ASCIIDOC} -n -o $@ $<
+
+%.docbook: %.text
+	${ASCIIDOC} -n -b docbook -o $@ $<
+
+%.texi: %.docbook
+	${DOCBOOKTOTEXI} --to-stdout $< > $@
 
 #
 # Developer targets
diff --git a/ccollect.sh b/ccollect.sh
index 485222b..9fa0914 100755
--- a/ccollect.sh
+++ b/ccollect.sh
@@ -25,7 +25,7 @@ FULL_VERSION="ccollect $VERSION ($RELEASE)"
 # DDATE: how the user should see it in our output
 #
 CDATE="date +%Y-%m-%d-%H%M"
-DDATE='date "+%Y-%m-%d %H:%M:%S"'
+DDATE="date"
 
 #
 # unset parallel execution