makepkg.conf : some info / docs adjustements

After commit 7865fb9af487, info pages are now treated like man pages.
This means even with !docs, info pages will still be included. And including
info pages was the main reason the docs option was enabled by default
recently. So this is now longer needed, and we can revert back to !docs by
default for disabling gigantic html pages and other docs.

Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>

2 files changed, 7 insertions, 6 deletions

diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt
index e59bb409..a8190038 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
@@ -111,7 +111,8 @@ Options
 
 	*docs*;;
 		Save doc directories. If you wish to delete doc directories, specify
-		`!docs' in the array.
+		`!docs' in the array. The directories affected are specified by the
+		`DOC_DIRS` variable.
 
 	*libtool*;;
 		Leave libtool (.la) files in packages. Specify `!libtool' to remove
@@ -128,7 +129,7 @@ Options
 	affects both generation and checking. The current valid options are:
 	`md5`, `sha1`, `sha256`, `sha384`, and `sha512`.
 
-**DOC_DIRS=(**usr/{,share/}{info,doc} ...**)**::
+**DOC_DIRS=(**usr/{,share/}{doc,gtk-doc} ...**)**::
 	If "!docs" is specified in the OPTIONS array, this variable will
 	instruct makepkg where to look to remove docs. If you build packages
 	that are located in opt/, you may need to add the directory to this
diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in
index c481e058..7eb647b2 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,11 +67,11 @@ 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)
-#-- Info and doc directories to remove (if option set correctly above)
+#-- Doc directories to remove (if option set correctly above)
 DOC_DIRS=(usr/{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
 #-- Directories to be searched for the strip option (if option set correctly above)
 STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin})