diff options
| author | Xavier Chantry <shiningxc@gmail.com> | 2009-01-03 11:19:12 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-01-13 05:28:10 +0100 |
| commit | 4ec846f5ac79497483c90eb52ced30164d9c0c1e (patch) | |
| tree | eace5b8b6dcc0c3b6b344402f69cb4600428b81b /etc | |
| parent | 0501d340cd57b3b1f31d9b7c273e882e21d0e621 (diff) | |
| download | pacman-4ec846f5ac79497483c90eb52ced30164d9c0c1e.tar.gz pacman-4ec846f5ac79497483c90eb52ced30164d9c0c1e.tar.xz | |
makepkg : fix a lot of breakages caused by Allan
This patch started as a simple typo fix (pugre instead of purge in two
places), as well as a fix of a test which was using PURGE_TARGETS instead of
$PURGE_TARGETS.
It evolved in a slight handling change of the OPTIONS which have a variable
affecting their behavior (strip STRIP_DIRS, docs DOC_DIRS, zipman MAN_DIRS
and purge PURGE_TARGETS), as well as a clarification in makepkg.conf. Now
when a variable is undefined or empty, the corresponding option will have no
effect. It looked weird to have a fallback when a option is defined but
empty, it seems more natural to not have any fallbacks.
Also re-enable docs by default. It seems arbitrary to delete files from
packages by default, and it would be more vanilla and distro agnostic to
keep them. docs was also the only negated option.
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/makepkg.conf.in | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 675e5f9b..d8118676 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -59,27 +59,27 @@ BUILDENV=(fakeroot !distcc color !ccache !xdelta) # These are default values for the options=() settings ######################################################################### # -# Default: OPTIONS=(strip !docs libtool emptydirs zipman purge) +# 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 -#-- docs: Save doc and info directories +#-- strip: Strip symbols from binaries/libraries in STRIP_DIRS +#-- docs: Save doc directories specified by DOC_DIRS #-- libtool: Leave libtool (.la) files in packages #-- emptydirs: Leave empty directories in packages -#-- zipman: Compress manual (man and info) pages with gzip -#-- purge: Remove files sepecified below from package +#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip +#-- purge: Remove files specified by PURGE_TARGETS # -OPTIONS=(strip !docs libtool emptydirs zipman purge) +OPTIONS=(strip docs libtool emptydirs zipman purge) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) -#-- Manual (man and info) directories to compress (if option set correctly above) +#-- Manual (man and info) directories to compress (if zipman is specified) MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) -#-- Doc directories to remove (if option set correctly above) +#-- Doc directories to remove (if !docs is specified) DOC_DIRS=(usr/{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) -#-- Directories to be searched for the strip option (if option set correctly above) +#-- 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 +#-- Files to be removed from all packages (if purge is specified) PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) ######################################################################### |