From 845a19ad42b2cc5354eefdbfcbfabc5a920210c8 Mon Sep 17 00:00:00 2001 From: Angel Ortega Date: Fri, 28 Nov 2008 12:04:04 +0100 Subject: [PATCH] Take into account docs that need both Grutatxt and mp_doccer. --- config.sh | 9 ++------- makefile.in | 3 ++- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/config.sh b/config.sh index 3721bb6..93d9a6c 100755 --- a/config.sh +++ b/config.sh @@ -411,10 +411,6 @@ if which grutatxt > /dev/null ; then DOCS="$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 @@ -426,11 +422,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 bb46f7e..2d9e2db 100644 --- a/makefile.in +++ b/makefile.in @@ -8,8 +8,9 @@ all: $(TARGET) docs PROJ=mpdm ADD_DOCS=RELEASE_NOTES -GRUTATXT_DOCS=doc/mpdm_overview.html doc/mpdm_api.html +GRUTATXT_DOCS=doc/mpdm_overview.html MP_DOCCER_DOCS=doc/mpdm_api.txt +G_AND_MP_DOCS=doc/mpdm_api.html OBJS=mpdm_v.o mpdm_a.o mpdm_h.o mpdm_d.o mpdm_s.o mpdm_f.o \ mpdm_r.o gnu_regex.o -- 2.11.4.GIT