On 03/07/14 01:04, Johannes Löthberg wrote:
Add support for following the XDG Base Directory Specification when reading the user-specific configuration file.
If no $XDG_CONFIG_HOME/pacman/makepkg.conf file exists we fall back to sourcing $HOME/.makepkg.conf
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> --- Was unsure if you wanted me to remove the variable or not, but it looked quite messy when I removed it so kept it in. Can re-send if you do want me to remove it.
I don't really care. Pulled to my branch with minor change indicated below.
doc/makepkg.conf.5.txt | 4 ++-- scripts/makepkg.sh.in | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index b15f026..dade39a 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -11,7 +11,7 @@ makepkg.conf - makepkg configuration file
Synopsis -------- -{sysconfdir}/makepkg.conf, ~/.makepkg.conf +{sysconfdir}/makepkg.conf, $XDG_CONFIG_HOME/pacman/makepkg.conf, ~/.makepkg.conf
Description @@ -27,7 +27,7 @@ variables. Some of them are non-standard.
The system-wide configuration file is found in {sysconfdir}/makepkg.conf. Individual options can be overridden (or added to) on a per-user basis in -~/.makepkg.conf. +$XDG_CONFIG_HOME/pacman/makepkg.conf or ~/.makepkg.conf.
Added ", with the former taking priority." Thanks, Allan