From ba2557af3312e7c26699ad239c41aacbb1f06bcd Mon Sep 17 00:00:00 2001
From: Angel Ortega <angel@triptico.com>
Date: Fri, 28 Nov 2008 12:20:31 +0100
Subject: [PATCH] Take into account docs that need both Grutatxt and mp_doccer.

---
 config.sh   | 9 ++-------
 makefile.in | 9 +++++----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/config.sh b/config.sh
index 8a536bf..4f29517 100755
--- a/config.sh
+++ b/config.sh
@@ -200,10 +200,6 @@ if which grutatxt > /dev/null ; then
 	DOCS="\$(GRUTATXT_DOCS)"
 else
 	echo "No"
-	echo
-	echo "Grutatxt not found; some documentation will not be generated."
-	echo "You can take it from http://www.triptico.com/software/grutatxt.html"
-	echo
 	echo "GRUTATXT=no" >> makefile.opts
 fi
 
@@ -215,11 +211,10 @@ if [ $? == 0 ] ; then
 	echo "OK"
 	echo "MP_DOCCER=yes" >> makefile.opts
 	DOCS="$DOCS \$(MP_DOCCER_DOCS)"
+
+	grep GRUTATXT=yes makefile.opts > /dev/null && DOCS="$DOCS \$(G_AND_MP_DOCS)"
 else
 	echo "No"
-	echo
-	echo "mp_doccer not found; some documentation will not be generated."
-	echo "You can take it from http://www.triptico.com/software/mp_doccer.html"
 	echo "MP_DOCCER=no" >> makefile.opts
 fi
 
diff --git a/makefile.in b/makefile.in
index 3327a45..bc0a706 100644
--- a/makefile.in
+++ b/makefile.in
@@ -14,7 +14,8 @@ GRUTATXT_DOCS=doc/ahs_overview_i.html \
 	doc/ahs_overview_ii.html \
 	doc/ahs_appendix_1.html \
 	doc/ahxm_index.html
-MP_DOCCER_DOCS=doc/ahxm_api.html
+MP_DOCCER_DOCS=doc/ahxm_api.txt
+G_AND_MP_DOCS=doc/ahxm_api.html
 
 all: $(BIN) $(DOCS)
 
@@ -71,13 +72,13 @@ distclean: realclean
 .txt.html:
 	grutatxt < $< > $@
 
-doc/ahxm_api.html: *.c
-	mp_doccer *.c -o doc/ahxm_api -f html1 \
+doc/ahxm_api.txt: *.c
+	mp_doccer *.c -o doc/ahxm_api -f grutatxt \
 		-t "Ann Hell Ex Machina API ($(VERSION))" \
 		-a 'Angel Ortega - angel@triptico.com'
 
 docsclean:
-	rm -f doc/*.html
+	rm -f $(MP_DOCCER_DOCS) doc/*.html
 
 distcopy: distclean y.tab.c y.tab.h lex.yy.c
 	mkdir -p $(DIST_TARGET) ; \
-- 
2.11.4.GIT