brew install: make -s apply only to given formula, not deps (#205)

2 files changed, 13 insertions, 5 deletions

diff --git a/share/doc/homebrew/brew.1.html b/share/doc/homebrew/brew.1.html
index daf613eb3..ca2230308 100644
--- a/share/doc/homebrew/brew.1.html
+++ b/share/doc/homebrew/brew.1.html
@@ -145,7 +145,7 @@ For tarballs, also print SHA-256 checksums.</p>
 <p>If <code>--HEAD</code> or <code>--devel</code> is passed, fetch that version instead of the
 stable version.</p>
 
-<p>If <code>-v</code> is passed, do a verbose VCS checkout, if the URL represents a CVS.
+<p>If <code>-v</code> is passed, do a verbose VCS checkout, if the URL represents a VCS.
 This is useful for seeing if an existing VCS cache has been updated.</p>
 
 <p>If <code>--force</code> is passed, remove a previously cached version and re-fetch.</p>
@@ -196,8 +196,13 @@ options but do not install the specified formula.</p>
 <code>gcc-4.2</code> for Apple's GCC 4.2, or <code>gcc-4.9</code> for a Homebrew-provided GCC
 4.9.</p>
 
-<p>If <code>--build-from-source</code> is passed, compile from source even if a bottle
-is provided for <var>formula</var>.</p>
+<p>If <code>--build-from-source</code> or <code>-s</code> is passed, compile the specified <var>formula</var> from
+source even if a bottle is provided. Dependencies will still be installed
+from bottles if they are available.</p>
+
+<p>If HOMEBREW_BUILD_FROM_SOURCE is set, regardless of whether <code>--build-from-source</code> was
+passed, then both <var>formula</var> and the dependencies installed as part of this process
+are built from source even if bottles are available.</p>
 
 <p>If <code>--force-bottle</code> is passed, install from a bottle if it exists
 for the current version of OS X, even if custom options are given.</p>
diff --git a/share/man/man1/brew.1 b/share/man/man1/brew.1
index acadd5de2..201e45a7d 100644
--- a/share/man/man1/brew.1
+++ b/share/man/man1/brew.1
@@ -196,7 +196,7 @@ Download the source packages for the given \fIformulae\fR\. For tarballs, also p
 If \fB\-\-HEAD\fR or \fB\-\-devel\fR is passed, fetch that version instead of the stable version\.
 .
 .IP
-If \fB\-v\fR is passed, do a verbose VCS checkout, if the URL represents a CVS\. This is useful for seeing if an existing VCS cache has been updated\.
+If \fB\-v\fR is passed, do a verbose VCS checkout, if the URL represents a VCS\. This is useful for seeing if an existing VCS cache has been updated\.
 .
 .IP
 If \fB\-\-force\fR is passed, remove a previously cached version and re\-fetch\.
@@ -265,7 +265,10 @@ If \fB\-\-only\-dependencies\fR is passed, install the dependencies with specifi
 If \fB\-\-cc=\fR\fIcompiler\fR is passed, attempt to compile using \fIcompiler\fR\. \fIcompiler\fR should be the name of the compiler\'s executable, for instance \fBgcc\-4\.2\fR for Apple\'s GCC 4\.2, or \fBgcc\-4\.9\fR for a Homebrew\-provided GCC 4\.9\.
 .
 .IP
-If \fB\-\-build\-from\-source\fR is passed, compile from source even if a bottle is provided for \fIformula\fR\.
+If \fB\-\-build\-from\-source\fR or \fB\-s\fR is passed, compile the specified \fIformula\fR from source even if a bottle is provided\. Dependencies will still be installed from bottles if they are available\.
+.
+.IP
+If HOMEBREW_BUILD_FROM_SOURCE is set, regardless of whether \fB\-\-build\-from\-source\fR was passed, then both \fIformula\fR and the dependencies installed as part of this process are built from source even if bottles are available\.
 .
 .IP
 If \fB\-\-force\-bottle\fR is passed, install from a bottle if it exists for the current version of OS X, even if custom options are given\.