summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-06-15 23:10:04 -0500
committerDan McGee <dan@archlinux.org>2008-06-19 08:50:17 -0500
commit5c6809987e235fea760c6feb6deaceaada09b53f (patch)
tree5a0d534d7fc130841b280456507ffb8d388d6a8c
parent29bf6814f74096e5d8ea22058e638eb362717b8a (diff)
downloadpacman-5c6809987e235fea760c6feb6deaceaada09b53f.tar.xz
makepkg.conf: make keeping docs the default
Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--doc/makepkg.conf.5.txt2
-rw-r--r--etc/makepkg.conf.in4
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt
index 113ad140..b5a49ba8 100644
--- a/doc/makepkg.conf.5.txt
+++ b/doc/makepkg.conf.5.txt
@@ -97,7 +97,7 @@ Options
running in the DistCC cluster. In addition, you will want to modify your
`MAKEFLAGS`.
-**OPTIONS=(**strip !docs libtool emptydirs zipman**)**::
+**OPTIONS=(**strip docs libtool emptydirs zipman**)**::
This array contains options that affect the 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
diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in
index 47ed0a45..bb2018f1 100644
--- a/etc/makepkg.conf.in
+++ b/etc/makepkg.conf.in
@@ -58,7 +58,7 @@ BUILDENV=(fakeroot !distcc color !ccache !xdelta)
# These are default values for the options=() settings
#########################################################################
#
-# Default: OPTIONS=(strip !docs libtool emptydirs zipman)
+# Default: OPTIONS=(strip docs libtool emptydirs zipman)
# A negated option will do the opposite of the comments below.
#
#-- strip: Strip symbols from binaries/libraries
@@ -67,7 +67,7 @@ BUILDENV=(fakeroot !distcc color !ccache !xdelta)
#-- emptydirs: Leave empty directories in packages
#-- zipman: Compress manpages with gzip
#
-OPTIONS=(strip !docs libtool emptydirs zipman)
+OPTIONS=(strip docs libtool emptydirs zipman)
#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
INTEGRITY_CHECK=(md5)