Fix pacman-optimize autoconf paths

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

2 files changed, 3 insertions, 6 deletions

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 20aa209b..1d711b84 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -33,12 +33,10 @@ MOSTLYCLEANFILES = $(bin_SCRIPTS) *.tmp
 edit = sed \
 	-e 's|@localedir[@]|$(localedir)|g' \
 	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
+	-e 's|@localstatedir[@]|$(localstatedir)|g' \
 	-e 's|@prefix[@]|$(prefix)|g' \
 	-e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \
     -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \
-    -e 's|@ROOTDIR[@]|$(ROOTDIR)|g' \
-    -e 's|@DBPATH[@]|$(DBPATH)|g' \
-    -e 's|@LOCKFILE[@]|$(LOCKFILE)|g' \
 	-e 's|@configure_input[@]|Generated from $@.in; do not edit by hand.|g'
 
 ## All the scripts depend on Makefile so that they are rebuilt when the
diff --git a/scripts/pacman-optimize.in b/scripts/pacman-optimize.in
index aaae6d24..3f7f51f7 100644
--- a/scripts/pacman-optimize.in
+++ b/scripts/pacman-optimize.in
@@ -26,9 +26,8 @@ export TEXTDOMAIN='pacman'
 export TEXTDOMAINDIR='@localedir@'
 
 myver='@PACKAGE_VERSION@'
-# TODO fix these paths
-dbroot='@ROOTDIR@@DBPATH@'
-lockfile='@ROOTDIR@@LOCKFILE@'
+dbroot='@localstatedir@/lib/pacman/'
+lockfile='@localstatedir@/run/pacman.lck'
 
 msg() {
 	local mesg=$1; shift