diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2015-09-03 22:23:29 +0100 |
|---|---|---|
| committer |   Anthony G. Basile <blueness@gentoo.org> | 2015-09-03 19:11:39 -0400 |
| commit | 9db91c6b743c212b74dece02b92a71c839808e4b (patch) | |
| tree | 5327c32783b2ba3a2005c632da3ca334519e4b91 | |
| parent | misc/install-xattr: update ChangeLog (diff) | |
| download | elfix-9db91c6b743c212b74dece02b92a71c839808e4b.tar.gz elfix-9db91c6b743c212b74dece02b92a71c839808e4b.tar.bz2 elfix-9db91c6b743c212b74dece02b92a71c839808e4b.zip | |
scripts/paxmark.sh: make.conf can be a directory
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | scripts/paxmark.sh | 10 |
2 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,7 @@ +2015-09-03 + + * scripts/paxmark.sh: make.conf can be a directory + 2014-12-22 * scripts/paxmark.sh: remove erroneous elog functions diff --git a/scripts/paxmark.sh b/scripts/paxmark.sh index 408e6aa..9d151f0 100755 --- a/scripts/paxmark.sh +++ b/scripts/paxmark.sh @@ -87,6 +87,14 @@ paxmarksh() { } MAKE_CONF="/etc/portage/make.conf" -[[ -e $MAKE_CONF ]] && source $MAKE_CONF + +if [[ -d $MAKE_CONF ]]; then + for MC in $MAKE_CONF/*; do + source $MC + done +elif [[ -e $MAKE_CONF ]]; then + source $MAKE_CONF +fi + PAX_MARKINGS=${PAX_MARKINGS:="PT"} paxmarksh "$@" |