Start moving hardcoded paths out of libalpm

Move the defaults for RootDir, CacheDir, DBPath, and LockFile into
pacman.conf, just as LogFile was done before. Add a section to
alpm_parse_config to look for a LockFile directive.

Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 5 insertions, 1 deletions

diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in
index 7960b9f3..bfc4265d 100644
--- a/etc/pacman.conf.in
+++ b/etc/pacman.conf.in
@@ -7,7 +7,11 @@
 # GENERAL OPTIONS
 #
 [options]
-LogFile     = /var/log/pacman.log
+RootDir     = @ROOTDIR@
+DBPath      = @localstatedir@/lib/pacman/
+CacheDir    = @localstatedir@/cache/pacman/pkg/
+LockFile    = @localstatedir@/run/pacman.lck
+LogFile     = @localstatedir@/log/pacman.log
 HoldPkg     = pacman glibc
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u