summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-03-23 08:18:57 +0100
committerDan McGee <dan@archlinux.org>2011-03-23 08:18:57 +0100
commit09085331277304e417649e8338795ca36a0d1f91 (patch)
treebce8d82ea1026fa00581f595b3fec1f5194bd11a /etc
parent36747e4a7f2bf26391573c113950f063daed19b9 (diff)
parenta31d091fb3bd250416d419b30e99c900b1608efc (diff)
downloadpacman-09085331277304e417649e8338795ca36a0d1f91.tar.gz
pacman-09085331277304e417649e8338795ca36a0d1f91.tar.xz
Merge branch 'gpg-build-tools'
Diffstat (limited to 'etc')
-rw-r--r--etc/makepkg.conf.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in
index 81a11b1d..286e2a84 100644
--- a/etc/makepkg.conf.in
+++ b/etc/makepkg.conf.in
@@ -39,7 +39,7 @@ CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
# BUILD ENVIRONMENT
#########################################################################
#
-# Defaults: BUILDENV=(fakeroot !distcc color !ccache check)
+# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign)
# A negated environment option will do the opposite of the comments below.
#
#-- fakeroot: Allow building packages as a non-root user
@@ -47,8 +47,9 @@ CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
#-- color: Colorize output messages
#-- ccache: Use ccache to cache compilation
#-- check: Run the check() function if present in the PKGBUILD
+#-- sign: Generate PGP signature file
#
-BUILDENV=(fakeroot !distcc color !ccache check)
+BUILDENV=(fakeroot !distcc color !ccache check !sign)
#
#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
#-- specify a space-delimited list of hosts running in the DistCC cluster.