From a5084a3077b0fecde0772e99302e0e7353c59da3 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 14 Sep 2012 22:29:39 -0700
Subject: docs: Remove referenece to autogen.sh and document waf build instead

---
 docs-xml/Samba3-HOWTO/TOSHARG-Compiling.xml | 47 ++---------------------------
 1 file changed, 2 insertions(+), 45 deletions(-)

(limited to 'docs-xml/Samba3-HOWTO')

diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Compiling.xml b/docs-xml/Samba3-HOWTO/TOSHARG-Compiling.xml
index bf0123483f..7236dc7d7c 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-Compiling.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-Compiling.xml
@@ -116,29 +116,10 @@ gpg: BAD signature from <quote>Samba Distribution Verification Key</quote>
 <sect1>
 	<title>Building the Binaries</title>
 	
-	<para>
-	<indexterm><primary>autogen.sh</primary></indexterm>
-<indexterm><primary>configure</primary></indexterm>
-	After the source tarball has been unpacked, the next step involves
-	configuration to match Samba to your operating system platform.
-	If your source directory does not contain the <command>configure</command> script,
-	it is necessary to build it before you can continue. Building of
-	the configure script requires the correct version of the autoconf
-	tool kit. Where the necessary version of autoconf is present,
-	the configure script can be generated by executing the following
-	(please note that in Samba 3.4.x, the directory is called source3 instead
-	of source):
-<screen>
-&rootprompt; cd samba-3.0.20/source
-&rootprompt; ./autogen.sh
-</screen>
-	</para>
-	
-
 	<para>
 	<indexterm><primary>configure</primary></indexterm>
 	To build the binaries, run the program <userinput>./configure
-	</userinput> in the source directory. This should automatically 
+	</userinput> in the top level director of the source tree. This should automatically 
 	configure Samba for your operating system. If you have unusual 
 	needs, then you may wish to first run:
 <screen>
@@ -167,30 +148,6 @@ gpg: BAD signature from <quote>Samba Distribution Verification Key</quote>
 </screen>
 	</para>
 	
-	<para>
-	Some people prefer to install binary files and man pages separately. If this is
-	your wish, the binary files can be installed by executing:
-<screen>
-&rootprompt; <userinput>make installbin</userinput>
-</screen>
-	The man pages can be installed using this command:
-<screen>
-&rootprompt; <userinput>make installman</userinput>
-</screen>
-	</para>
-
-	<para>
-	Note that if you are upgrading from a previous version of Samba the old
-	versions of the binaries will be renamed with an <quote>.old</quote> extension.
-	You can go back to the previous version by executing:
-<screen>
-&rootprompt; <userinput>make revert</userinput>
-</screen>
-	As you can see from this, building and installing Samba does not need to
-	result in disaster!
-	</para>
-	
-
 	<sect2>
 	<title>Compiling Samba with Active Directory Support</title>
 	
@@ -220,7 +177,7 @@ gpg: BAD signature from <quote>Samba Distribution Verification Key</quote>
 
 	<para>
 	After you run configure, make sure that the 
-	<filename>include/config.h</filename> it generates contain lines like this:
+	<filename>bin/include/config.h</filename> it generates contain lines like this:
 <programlisting>
 #define HAVE_KRB5 1
 #define HAVE_LDAP 1
-- 
cgit