[llvm-commits] CVS: llvm/www/docs/GettingStarted.html

[John Criswell]

Changes in directory llvm/www/docs:

GettingStarted.html updated: 1.12.2.3 -> 1.12.2.4

---
Log message:

Merged with mainline.


---
Diffs of the changes:

Index: llvm/www/docs/GettingStarted.html
diff -u llvm/www/docs/GettingStarted.html:1.12.2.3 llvm/www/docs/GettingStarted.html:1.12.2.4
--- llvm/www/docs/GettingStarted.html:1.12.2.3	Thu Jun 26 11:15:54 2003
+++ llvm/www/docs/GettingStarted.html	Thu Jun 26 16:33:12 2003
@@ -54,7 +54,7 @@
     <!--=====================================================================-->
 
     <p>The <a href"starting">next section</a> of this guide is meant to get
-    you up and running with LLVM, and to give you some basic information about
+    you up and running with LLVM and to give you some basic information about
     the LLVM environment.  The <a href"#quickstart">first subsection</a> gives
     a short summary for those who are already familiar with the system and
     want to get started as quickly as possible.
@@ -262,7 +262,7 @@
     This environment variable is used to locate "system" libraries like
     "<tt>-lc</tt>" and "<tt>-lm</tt>" when linking.  This variable should be set
     to the absolute path for the bytecode-libs subdirectory of the C front-end
-    install.  For example, <tt>LLVM_LIB_SEARCH_PATH</tt> is set to
+    install.  For example, one might set <tt>LLVM_LIB_SEARCH_PATH</tt> to
     <tt>/home/vadve/lattner/local/x86/llvm-gcc/bytecode-libs</tt> for the X86
     version of the C front-end on our research machines.<p>
 
@@ -305,8 +305,8 @@
     included in the CVS tree you just checked out.
 
     <p>The other <a href="#tools">LLVM tools</a> are part of the LLVM
-    source base and are built when compiling LLVM.  They will be built into the
-    <tt><i>LLVM_OBJ_DIR</i>/tools/Debug</tt> directory.</p>
+    source base and built when compiling LLVM.  They will be built into the
+    <tt><i>OBJ_ROOT</i>/tools/Debug</tt> directory.</p>
 
     <!------------------------------------------------------------------------->
     <h3><a name="compile">Compiling the source code</a></h3>
@@ -314,7 +314,9 @@
 
     <p>Every directory in the LLVM source tree includes a <tt>Makefile</tt> to
     build it and any subdirectories that it contains.  These makefiles require
-    that you use <tt>gmake</tt>, instead of <tt>make</tt> to build them, but can
+    that you use GNU Make (sometimes called <tt>gmake</tt>) instead of
+    <tt>make</tt> to
+    build them, but can
     otherwise be used freely.  To build the entire LLVM system, just enter the
     top level <tt>llvm</tt> directory and type <tt>gmake</tt>.  A few minutes
     later you will hopefully have a freshly compiled toolchain waiting for you
@@ -322,8 +324,8 @@
     libraries that
     were compiled, look in <tt><i>OBJ_ROOT</i>/llvm/lib/Debug</tt>.</p>
 
-    If you get an error talking about a <tt>/localhome</tt> directory, follow
-    the instructions in the section about <a href="#environment">Setting Up Your
+    If you get an error about a <tt>/localhome</tt> directory, follow the
+    instructions in the section about <a href="#environment">Setting Up Your
     Environment.</a>
 
 
@@ -344,7 +346,7 @@
     <h3><a name="cvsdir"><tt>CVS</tt> directories</a></h3>
     <!------------------------------------------------------------------------->
 
-    Every directory checked out of CVS will contain a <tt>CVS</tt> directory,
+    Every directory checked out of CVS will contain a <tt>CVS</tt> directory;
     for the most part these can just be ignored.
 
 
@@ -361,7 +363,7 @@
     directory contains automatically generated dependance files which are used
     during compilation to make sure that source files get rebuilt if a header
     file they use is modified. The <tt>Debug</tt> directory holds the object
-    files, library files and executables that are used for building a debug
+    files, library files, and executables that are used for building a debug
     enabled build.  The <tt>Release</tt> directory is created to hold the same
     files when the <tt>ENABLE_OPTIMIZED=1</tt> flag is passed to <tt>gmake</tt>,
     causing an optimized build to be performed.<p>