summaryrefslogtreecommitdiff
path: root/makepkg-i686.conf
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2011-03-26 12:42:21 +0100
committerPierre Schmitz <pierre@archlinux.de>2011-03-26 12:42:21 +0100
commit96a11523e51d6991a86165437c1c0c5d632142aa (patch)
treedc2762f96139c2a2cd63d0d6e7d74cc82a0976a7 /makepkg-i686.conf
parentbdde6e5a35a697603e9637bbc0e153b1d2fa4320 (diff)
Update default makepkg.conf and pacman.conf to match the ones from pacman 3.5
Diffstat (limited to 'makepkg-i686.conf')
-rw-r--r--makepkg-i686.conf9
1 files changed, 4 insertions, 5 deletions
diff --git a/makepkg-i686.conf b/makepkg-i686.conf
index 553f943..73c7fbf 100644
--- a/makepkg-i686.conf
+++ b/makepkg-i686.conf
@@ -39,15 +39,16 @@ LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed"
# BUILD ENVIRONMENT
#########################################################################
#
-# Defaults: BUILDENV=(fakeroot !distcc color !ccache)
+# Defaults: BUILDENV=(fakeroot !distcc color !ccache check)
# A negated environment option will do the opposite of the comments below.
#
#-- fakeroot: Allow building packages as a non-root user
#-- distcc: Use the Distributed C/C++/ObjC compiler
#-- color: Colorize output messages
#-- ccache: Use ccache to cache compilation
+#-- check: Run the check() function if present in the PKGBUILD
#
-BUILDENV=(fakeroot !distcc color !ccache)
+BUILDENV=(fakeroot !distcc color !ccache check)
#
#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
#-- specify a space-delimited list of hosts running in the DistCC cluster.
@@ -61,7 +62,7 @@ BUILDENV=(fakeroot !distcc color !ccache)
# Default: OPTIONS=(strip docs libtool emptydirs zipman purge)
# A negated option will do the opposite of the comments below.
#
-#-- strip: Strip symbols from binaries/libraries in STRIP_DIRS
+#-- strip: Strip symbols from binaries/libraries
#-- docs: Save doc directories specified by DOC_DIRS
#-- libtool: Leave libtool (.la) files in packages
#-- emptydirs: Leave empty directories in packages
@@ -82,8 +83,6 @@ STRIP_STATIC="--strip-debug"
MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
#-- Doc directories to remove (if !docs is specified)
DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
-#-- Directories to be searched for the strip option (if strip is specified)
-STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin})
#-- Files to be removed from all packages (if purge is specified)
PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)