diff options
| author | Dan McGee <dan@archlinux.org> | 2011-06-14 15:29:39 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-06-14 15:29:39 +0200 |
| commit | fbb44a6e0d5d3c386420dded0442f4771dbaea7c (patch) | |
| tree | e704eb9c6debe0cf600f2a8f65cd50b8ddce9e14 /doc | |
| parent | 00a1b1deeb390d99c99d942ef4d8bfe1a943b02a (diff) | |
| parent | 07e97a5f2c1e1039f35a7893d2be6abf07af690a (diff) | |
| download | pacman-fbb44a6e0d5d3c386420dded0442f4771dbaea7c.tar.gz pacman-fbb44a6e0d5d3c386420dded0442f4771dbaea7c.tar.xz | |
Merge branch 'maint'
Conflicts:
doc/makepkg.conf.5.txt
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/makepkg.conf.5.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 9d3ad0a1..3ce4759f 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -70,7 +70,7 @@ Options This is often used to set the number of jobs used, for example, `-j2`. Other flags that make accepts can also be passed. -**BUILDENV=(**fakeroot !distcc color !ccache !sign**)**:: +**BUILDENV=(**fakeroot !distcc color !ccache check !sign**)**:: This array contains options that affect the build environment, the defaults are shown here. All options should always be left in the array; to enable or disable an option simply remove or place an ``!'' at the front of the |