svn commit - mysqldoc@docsrva: r2448 - in trunk: . refman-4.1 refman-5.0 refman-5.1

[paul]

Author: paul
Date: 2006-06-20 22:02:24 +0200 (Tue, 20 Jun 2006)
New Revision: 2448

Log:
 r11530@frost:  paul | 2006-06-20 14:57:36 -0500
 Simplify/update Autoconf instructions for BitKeeper section.


Modified:
   trunk/
   trunk/refman-4.1/installing.xml
   trunk/refman-5.0/installing.xml
   trunk/refman-5.1/installing.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:10739
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:11529
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:7663
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:10739
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:11530
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:7663

Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2006-06-20 20:01:55 UTC (rev 2447)
+++ trunk/refman-4.1/installing.xml	2006-06-20 20:02:24 UTC (rev 2448)
@@ -8520,11 +8520,9 @@
 
 <programlisting>
 shell&gt; <userinput>cd mysql-5.0</userinput>
-shell&gt; <userinput>aclocal; autoheader</userinput>
-shell&gt; <userinput>libtoolize --automake --force</userinput>
-shell&gt; <userinput>automake --force --add-missing; autoconf</userinput>
-shell&gt; <userinput>(cd innobase; aclocal; autoheader; autoconf; automake)</userinput>
 shell&gt; <userinput>(cd bdb/dist; sh s_all)</userinput>
+shell&gt; <userinput>(cd innobase; autoreconf --force --install)</userinput>
+shell&gt; <userinput>autoreconf --force --install</userinput>
 shell&gt; <userinput>./configure  # Add your favorite options here</userinput>
 shell&gt; <userinput>make</userinput>
 </programlisting>

Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml	2006-06-20 20:01:55 UTC (rev 2447)
+++ trunk/refman-5.0/installing.xml	2006-06-20 20:02:24 UTC (rev 2448)
@@ -8331,11 +8331,9 @@
 
 <programlisting>
 shell&gt; <userinput>cd mysql-&current-series;</userinput>
-shell&gt; <userinput>aclocal; autoheader</userinput>
-shell&gt; <userinput>libtoolize --automake --force</userinput>
-shell&gt; <userinput>automake --force --add-missing; autoconf</userinput>
-shell&gt; <userinput>(cd innobase; aclocal; autoheader; autoconf; automake)</userinput>
 shell&gt; <userinput>(cd bdb/dist; sh s_all)</userinput>
+shell&gt; <userinput>(cd innobase; autoreconf --force --install)</userinput>
+shell&gt; <userinput>autoreconf --force --install</userinput>
 shell&gt; <userinput>./configure  # Add your favorite options here</userinput>
 shell&gt; <userinput>make</userinput>
 </programlisting>

Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-06-20 20:01:55 UTC (rev 2447)
+++ trunk/refman-5.1/installing.xml	2006-06-20 20:02:24 UTC (rev 2448)
@@ -8392,11 +8392,9 @@
 
 <programlisting>
 shell&gt; <userinput>cd mysql-&current-series;</userinput>
-shell&gt; <userinput>aclocal; autoheader</userinput>
-shell&gt; <userinput>libtoolize --automake --force</userinput>
-shell&gt; <userinput>automake --force --add-missing; autoconf</userinput>
-shell&gt; <userinput>(cd storage/innobase; aclocal; autoheader; autoconf; automake)</userinput>
 shell&gt; <userinput>(cd storage/bdb/dist; sh s_all)</userinput>
+shell&gt; <userinput>(cd storage/innobase; autoreconf --force --install)</userinput>
+shell&gt; <userinput>autoreconf --force --install</userinput>
 shell&gt; <userinput>./configure  # Add your favorite options here</userinput>
 shell&gt; <userinput>make</userinput>
 </programlisting>