From b963e5d723f86b48593c5bcf77787dba4d39b01a Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Thu, 24 Oct 2013 13:15:24 -0700
Subject: adt-manual: Edits to the "Using a Cross-Toolchain Tarball" section.

This section was not quite right for the installation method
after obtaining the tarball.  There was some old stuff in there
and it didn't mention the fact that the script asks you what
directory you want to install into.

(From yocto-docs rev: d950b48fede7a139aad0aa4da39a2b34fa565438)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 documentation/adt-manual/adt-prepare.xml | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'documentation/adt-manual')

diff --git a/documentation/adt-manual/adt-prepare.xml b/documentation/adt-manual/adt-prepare.xml
index 5a23ac6c78..b23bfc05e4 100644
--- a/documentation/adt-manual/adt-prepare.xml
+++ b/documentation/adt-manual/adt-prepare.xml
@@ -288,8 +288,10 @@
                     </itemizedlist></para></listitem>
                 <listitem><para>Once you have the installer, run it to install
                     the toolchain.
-                    You must change the permissions on the toolchain installer
-                    script so that it is executable.</para>
+                    <note>
+                        You must change the permissions on the toolchain
+                        installer script so that it is executable.
+                    </note></para>
                     <para>The following command shows how to run the installer
                     given a toolchain tarball for a 64-bit x86 development host
                     system and a 32-bit x86 target architecture.
@@ -298,17 +300,20 @@
                     <literallayout class='monospaced'>
      $ ~/Downloads/poky-eglibc-x86_64-core-image-sato-i586-toolchain-&DISTRO;.sh
                     </literallayout>
-                    <note>
-                        If you do not have write permissions for the directory
-                        into which you are installing the toolchain, the
-                        toolchain installer notifies you and exits.
-                        Be sure you have write permissions in the directory and
-                        run the installer again.
-                    </note>
-                    Once the tarball is expanded, the cross-toolchain is
+                    The first thing the installer prompts you for is the
+                    directory into which you want to install the toolchain.
+                    The default directory used is
+                    <filename>opt/poky/&DISTRO;</filename>.
+                    If you do not have write permissions for the directory
+                    into which you are installing the toolchain, the
+                    toolchain installer notifies you and exits.
+                    Be sure you have write permissions in the directory and
+                    run the installer again.</para>
+                    <para>When the script finishes, the cross-toolchain is
                     installed.
                     You will notice environment setup files for the
-                    cross-toolchain in the directory.</para></listitem>
+                    cross-toolchain in the installation directory.
+                    </para></listitem>
             </orderedlist>
         </para>
     </section>
-- 
cgit v1.2.3-54-g00ecf