summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorXavier Chantry <shiningxc@gmail.com>2009-01-03 11:19:12 +0100
committerDan McGee <dan@archlinux.org>2009-01-12 22:28:10 -0600
commit4ec846f5ac79497483c90eb52ced30164d9c0c1e (patch)
treeeace5b8b6dcc0c3b6b344402f69cb4600428b81b /doc
parent0501d340cd57b3b1f31d9b7c273e882e21d0e621 (diff)
downloadpacman-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 'doc')
-rw-r--r--doc/makepkg.conf.5.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt
index 044c69ea..f699f50e 100644
--- a/doc/makepkg.conf.5.txt
+++ b/doc/makepkg.conf.5.txt
@@ -128,10 +128,11 @@ Options
Leave empty directories in packages.
*zipman*;;
- Compress manual (man and info) pages with gzip.
+ Compress manual (man and info) pages with gzip. The directories
+ affected are specified by the `MAN_DIRS` variable.
*purge*;;
- Remove files specified by the `PUGRE_TARGETS` variable from the
+ Remove files specified by the `PURGE_TARGETS` variable from the
package.
**INTEGRITY_CHECK=(**check1 ...**)**::