summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--makechrootpkg.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in
index 709e824..6f80384 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -306,7 +306,12 @@ fi
umask 0022
-load_vars "$USER_HOME/.makepkg.conf"
+XDG_PACMAN_DIR="${XDG_CONFIG_HOME:-$USER_HOME/.config}/pacman"
+if [[ -r "$XDG_PACMAN_DIR/makepkg.conf" ]]; then
+ load_vars "$XDG_PACMAN_DIR/makepkg.conf"
+elif [[ -r "$USER_HOME/.makepkg.conf" ]]; then
+ load_vars "$USER_HOME/.makepkg.conf"
+fi
load_vars /etc/makepkg.conf
# Use PKGBUILD directory if these don't exist