aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVonUniGE2017-07-11 23:43:28 +0200
committerMathieu Vonlanthen2017-07-11 23:43:28 +0200
commit7957e1a7215464486bf559d66438e79df6e766ce (patch)
treeedd06fafa3cc237650ccba6c9c9cabd5849cd206
parent16496a0b0fd7956922a55d9c816306feb1cd7b98 (diff)
downloadbrew-7957e1a7215464486bf559d66438e79df6e766ce.tar.bz2
Add a suitable explanatory line
-rw-r--r--Library/Homebrew/cmd/install.rb5
-rw-r--r--docs/Manpage.md5
-rw-r--r--manpages/brew.15
3 files changed, 12 insertions, 3 deletions
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb
index f4d5dcce7..da48582d2 100644
--- a/Library/Homebrew/cmd/install.rb
+++ b/Library/Homebrew/cmd/install.rb
@@ -1,4 +1,4 @@
-#: * `install` [`--debug`] [`--env=`(`std`|`super`)] [`--ignore-dependencies`|`--only-dependencies`] [`--cc=`<compiler>] [`--build-from-source`|`--force-bottle`] [`--devel`|`--HEAD`] [`--keep-tmp`] [`--build-bottle`] <formula> [`install-options`]:
+#: * `install` [`--debug`] [`--env=`(`std`|`super`)] [`--ignore-dependencies`|`--only-dependencies`] [`--cc=`<compiler>] [`--build-from-source`|`--force-bottle`] [`--devel`|`--HEAD`] [`--keep-tmp`] [`--build-bottle`] <formula> [<options> ...]:
#: Install <formula>.
#:
#: <formula> is usually the name of the formula to install, but it can be specified
@@ -47,6 +47,9 @@
#: If `--build-bottle` is passed, prepare the formula for eventual bottling
#: during installation.
#:
+#: Installation options specific to <formula> may be appended to the command,
+#: and can be listed with `brew options` <formula>.
+#:
#: * `install` `--interactive` [`--git`] <formula>:
#: If `--interactive` (or `-i`) is passed, download and patch <formula>, then
#: open a shell. This allows the user to run `./configure --help` and
diff --git a/docs/Manpage.md b/docs/Manpage.md
index 02bd35898..5feb74db6 100644
--- a/docs/Manpage.md
+++ b/docs/Manpage.md
@@ -198,7 +198,7 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note
See the docs for examples of using the JSON output:
<http://docs.brew.sh/Querying-Brew.html>
- * `install` [`--debug`] [`--env=`(`std`|`super`)] [`--ignore-dependencies`|`--only-dependencies`] [`--cc=``compiler`] [`--build-from-source`|`--force-bottle`] [`--devel`|`--HEAD`] [`--keep-tmp`] [`--build-bottle`] `formula` [`install-options`]:
+ * `install` [`--debug`] [`--env=`(`std`|`super`)] [`--ignore-dependencies`|`--only-dependencies`] [`--cc=``compiler`] [`--build-from-source`|`--force-bottle`] [`--devel`|`--HEAD`] [`--keep-tmp`] [`--build-bottle`] `formula` : [<`options`> ...]
Install `formula`.
`formula` is usually the name of the formula to install, but it can be specified
@@ -247,6 +247,9 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note
If `--build-bottle` is passed, prepare the formula for eventual bottling
during installation.
+ Installation options specific to <formula> may be appended to the command,
+ and can be listed with `brew options` <formula>.
+
* `install` `--interactive` [`--git`] `formula`:
If `--interactive` (or `-i`) is passed, download and patch `formula`, then
open a shell. This allows the user to run `./configure --help` and
diff --git a/manpages/brew.1 b/manpages/brew.1
index e010cfb4d..430faa92e 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -216,7 +216,7 @@ Pass \fB\-\-all\fR to get information on all formulae, or \fB\-\-installed\fR to
See the docs for examples of using the JSON output: \fIhttp://docs\.brew\.sh/Querying\-Brew\.html\fR
.
.TP
-\fBinstall\fR [\fB\-\-debug\fR] [\fB\-\-env=\fR(\fBstd\fR|\fBsuper\fR)] [\fB\-\-ignore\-dependencies\fR|\fB\-\-only\-dependencies\fR] [\fB\-\-cc=\fR\fIcompiler\fR] [\fB\-\-build\-from\-source\fR|\fB\-\-force\-bottle\fR] [\fB\-\-devel\fR|\fB\-\-HEAD\fR] [\fB\-\-keep\-tmp\fR] [\fB\-\-build\-bottle\fR] \fIformula\fR [\fIinstall\-options\fR]
+\fBinstall\fR [\fB\-\-debug\fR] [\fB\-\-env=\fR(\fBstd\fR|\fBsuper\fR)] [\fB\-\-ignore\-dependencies\fR|\fB\-\-only\-dependencies\fR] [\fB\-\-cc=\fR\fIcompiler\fR] [\fB\-\-build\-from\-source\fR|\fB\-\-force\-bottle\fR] [\fB\-\-devel\fR|\fB\-\-HEAD\fR] [\fB\-\-keep\-tmp\fR] [\fB\-\-build\-bottle\fR] \fIformula\fR [\fIoptions\fR \.\.\.]
Install \fIformula\fR\.
.
.IP
@@ -261,6 +261,9 @@ If \fB\-\-keep\-tmp\fR is passed, the temporary files created during installatio
.IP
If \fB\-\-build\-bottle\fR is passed, prepare the formula for eventual bottling during installation\.
.
+.IP
+Installation \fIoptions\fR specific to \fIformula\fR may be appended to the command, and can be listed with \fBbrew options <formula>\fR.
+.
.TP
\fBinstall\fR \fB\-\-interactive\fR [\fB\-\-git\fR] \fIformula\fR
If \fB\-\-interactive\fR (or \fB\-i\fR) is passed, download and patch \fIformula\fR, then open a shell\. This allows the user to run \fB\./configure \-\-help\fR and otherwise determine how to turn the software package into a Homebrew formula\.