summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2017-09-26 18:16:39 +0200
committerAllan McRae <allan@archlinux.org>2017-12-07 05:58:53 +0100
commit44f3a157983e903f926b4f11ddb3f57d111e60f9 (patch)
treef7b7bd8d8cbc2fa768944b1288a4e0f5741dd020 /doc
parentab2be5794de8a57426ec3fc0f631cc766a0b8227 (diff)
downloadpacman-44f3a157983e903f926b4f11ddb3f57d111e60f9.tar.gz
pacman-44f3a157983e903f926b4f11ddb3f57d111e60f9.tar.xz
makepkg.conf: correct the documentation on the default options
The documentation for OPTIONS and BUILDENV listed some incorrect defaults for undefined options. The defaults are implementation-defined in the source code for makepkg itself (e.g. it depends whether we use `check_option "opt" "y"` or `check_option "opt" "n"`) but were erroneously declared to be "whatever we *define* in the default makepkg.conf". Fixes FS#55754 Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'doc')
-rw-r--r--doc/makepkg.conf.5.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt
index 5bd3472f..aa093401 100644
--- a/doc/makepkg.conf.5.txt
+++ b/doc/makepkg.conf.5.txt
@@ -92,7 +92,7 @@ Options
**DEBUG_CXXFLAGS=**"debug_cxxflags"::
Debug flags used for the C++ compiler; see DEBUG_CFLAGS for more info.
-**BUILDENV=(**!distcc color !ccache check !sign**)**::
+**BUILDENV=(**!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 add an ``!'' at the front of the
@@ -141,7 +141,7 @@ Options
Specify a key to use for GPG signing instead of the default key in the
keyring. Can be overridden with makepkg's '\--key' option.
-**OPTIONS=(**strip docs libtool staticlibs emptydirs zipman purge**)**::
+**OPTIONS=(**!strip docs libtool staticlibs emptydirs !zipman !purge !debug**)**::
This array contains options that affect default packaging. They are
equivalent to options that can be placed in the PKGBUILD; the defaults are
shown here. All options should always be left in the array; to enable or