[pacman-dev] makepkg.conf: Reword "Defaults"

Message ID 20200903024709.640656-1-allan@archlinux.org
State New
Headers show
Series
  • [pacman-dev] makepkg.conf: Reword "Defaults"
Related show

Commit Message

Allan McRae Sept. 3, 2020, 2:47 a.m. UTC
FS#61661 notes that we have a comment "Defaults" value for BUILDENV and OPTIONS
but that does not necessarily correspond to what the example makepkg.conf sets.

Change the comment to "Makepkg defaults" to indicate this is what makepkg will
do unless told otherwise.

Signed-off-by: Allan McRae <allan@archlinux.org>
---
 etc/makepkg.conf.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Eli Schwartz Sept. 4, 2020, 2:50 a.m. UTC | #1
On 9/2/20 10:47 PM, Allan McRae wrote:
> FS#61661 notes that we have a comment "Defaults" value for BUILDENV and OPTIONS
> but that does not necessarily correspond to what the example makepkg.conf sets.
> 
> Change the comment to "Makepkg defaults" to indicate this is what makepkg will
> do unless told otherwise.
ACK.

This seems like a very reasonable clarification to make and I really
don't want to back out 44f3a157983e903f926b4f11ddb3f57d111e60f9 :D

Patch

diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in
index 1c7988d2..e9582646 100644
--- a/etc/makepkg.conf.in
+++ b/etc/makepkg.conf.in
@@ -52,7 +52,7 @@  CHOST="@CHOST@"
 # BUILD ENVIRONMENT
 #########################################################################
 #
-# Defaults: BUILDENV=(!distcc !color !ccache check !sign)
+# Makepkg defaults: BUILDENV=(!distcc !color !ccache check !sign)
 #  A negated environment option will do the opposite of the comments below.
 #
 #-- distcc:   Use the Distributed C/C++/ObjC compiler
@@ -75,7 +75,7 @@  BUILDENV=(!distcc color !ccache check !sign)
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Default: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug)
+# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug)
 #  A negated option will do the opposite of the comments below.
 #
 #-- strip:      Strip symbols from binaries/libraries