Docs/Makefile.am

  Fixed a small bug.. comment was being overwritten.
Docs/Support/test-make-manual
  Will now fix it's own dependencies.. includes checking out files
  and creating it's own include.texi.


Docs/Makefile.am:
  Fixed small bug, comment was not being included. ;)
Docs/Support/test-make-manual:
  test-make-manual will now fix it's own dependencies.
  This is useful for those of us who don't have all files in the
  repository checked out all the time.

2 files changed, 70 insertions, 2 deletions

diff --git a/Docs/Makefile.am b/Docs/Makefile.am
index 4f61d93c0e5..3d8c3e39905 100644
--- a/Docs/Makefile.am
+++ b/Docs/Makefile.am
@@ -39,8 +39,8 @@ paper: manual_a4.ps manual_letter.ps  $(PDFMANUAL)
 
 # The Makefile contains the previous version so we can not use that
 include.texi:	../configure.in
-	echo -n "@c This file is autogenerated by the Makefile" > $@
-	echo -n "@set mysql_version " > $@
+	echo "@c This file is autogenerated by the Makefile" > $@
+	echo -n "@set mysql_version " >> $@
 	grep "AM_INIT_AUTOMAKE(mysql, " ../configure.in | \
 	 sed -e 's;AM_INIT_AUTOMAKE(mysql, ;;' -e 's;);;' >> $@
 	echo -n "@set default_port " >> $@
diff --git a/Docs/Support/test-make-manual b/Docs/Support/test-make-manual
index 72f4fdac10d..ab76fae915b 100755
--- a/Docs/Support/test-make-manual
+++ b/Docs/Support/test-make-manual
@@ -7,6 +7,54 @@ function die
   exit 1
 }
 
+needed_flags=0
+needed_texi2html=0
+needed_texinfo_tex=0
+needed_include_texi=0
+
+if [ -e Flags/usa.txt ]; then
+    echo "Good, Flags are there."
+else
+    echo -n "Checking out Flags..."
+    bk edit Flags >/dev/null 2>&1
+    echo " Done."
+    needed_flags=1
+fi
+
+if [ -e Support/texi2html ]; then
+    echo "Good, texi2html is there."
+else
+    echo -n "Checking out texi2html..."
+    bk edit Support/texi2html >/dev/null 2>&1
+    echo " Done."
+    needed_texi2html=1
+fi
+
+if [ -e Support/texinfo.tex ]; then
+    echo "Good, texinfo.tex is there."
+else
+    echo -n "Checking out texinfo.tex..."
+    bk edit Support/texinfo.tex >/dev/null 2>&1
+    echo " Done."
+    needed_texinfo_tex=1
+fi
+
+if [ -e include.texi ]; then
+    echo "Good, include.texi is there."
+else
+    echo -n "Creating include.texi..."
+    bk edit ../configure.in >/dev/null 2>&1
+    echo "@c This file was generated by test-make-manual" > include.texi
+    echo -n "@set mysql_version " >> include.texi
+    grep "AM_INIT_AUTOMAKE(mysql, " ../configure.in | \
+    sed -e 's;AM_INIT_AUTOMAKE(mysql, ;;' -e 's;);;' >> include.texi
+    echo -n "@set default_port " >> include.texi
+    grep "MYSQL_TCP_PORT_DEFAULT=" ../configure.in | \
+    sed -e 's;MYSQL_TCP_PORT_DEFAULT=;;' >> include.texi
+    echo " Done."
+    needed_include_texi=1
+fi
+
 echo -n "Running makeinfo..."
 makeinfo --no-split -I . manual.texi
 
@@ -36,6 +84,26 @@ else
     echo " Looks good."
 fi
 
+needed_flags=0
+needed_texi2html=0
+needed_texinfo_tex=0
+needed_include_texi=0
+
+if [ $needed_flags ]; then
+    bk clean Flags
+fi
+
+if [ $needed_texi2html ]; then
+    bk clean Support/texi2html
+fi
+
+if [ $needed_texinfo_tex ]; then
+    bk clean Support/texinfo.tex
+fi
+
+if [ $needed_include_texi ]; then
+    rm -f include.texi
+fi
 
 [ -z $BROWSER ] && BROWSER=netscape