Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/scripts/makepkg.in
diff options
context:
space:
mode:
authorAndrew Fyfe <andrew@neptune-one.net>2007-05-28 20:49:28 +0100
committerDan McGee <dan@archlinux.org>2007-05-29 17:49:24 -0400
commit5c41d0eb4c7034998d9718f89e12f44fe872ab9a (patch)
tree92905a04a5987ab7e9ec17515417d16cffb556b4 /scripts/makepkg.in
parentd255d511aa9cbfa7b3bf056908c07f5afed69b72 (diff)
Substitute config directory in scripts.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Diffstat (limited to 'scripts/makepkg.in')
-rw-r--r--scripts/makepkg.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/makepkg.in b/scripts/makepkg.in
index 0743b8fc..278050d7 100644
--- a/scripts/makepkg.in
+++ b/scripts/makepkg.in
@@ -38,8 +38,8 @@ startdir=$(pwd)
# Only use ABSROOT if we haven't been passed a SRCROOT on the command line.
if [ -z "$SRCROOT" ]; then
- if [ -r /etc/abs/abs.conf ]; then
- source /etc/abs/abs.conf
+ if [ -r @SYSCONFDIR@/abs/abs.conf ]; then
+ source @SYSCONFDIR@/abs/abs.conf
fi
if [ -r ~/.abs.conf ]; then
source ~/.abs.conf
@@ -649,8 +649,8 @@ _PKGDEST=${PKGDEST}
_SRCDEST=${SRCDEST}
# Source makepkg.conf; fail if it is not found
-if [ -r /etc/makepkg.conf ]; then
- source /etc/makepkg.conf
+if [ -r @SYSCONFDIR@/makepkg.conf ]; then
+ source @SYSCONFDIR@/makepkg.conf
else
error "$(gettext "/etc/makepkg.conf not found. cannot continue")"
exit 1 # $E_CONFIG_ERROR # TODO: error codes