Set paths in pacman-optimize to use configure-time paths

By setting up a few more AC_SUBST macros in configure.ac, we can fill in
paths in the scripts on the fly instead of having them in multiple places.

Other small fixes:
* Fix an oops on my last commit where I had some lines stil commented.
* Fix makepkg bug where the generated package name using PKGEXT had two
  periods (..).

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

1 files changed, 4 insertions, 7 deletions

diff --git a/scripts/pacman-optimize.in b/scripts/pacman-optimize.in
index cce4a5c1..ca6378f2 100644
--- a/scripts/pacman-optimize.in
+++ b/scripts/pacman-optimize.in
@@ -21,11 +21,8 @@
 #
 
 myver='@PACKAGE_VERSION@'
-#TODO replace with configure-time db location
-dbroot="/var/lib/pacman"
-#TODO replace with configure-time lockfile location
-lockfile="/tmp/pacman.lck"
-
+dbroot='@ROOTDIR@@DBPATH@'
+lockfile='@ROOTDIR@@LOCKFILE@'
 
 error() {
 	if [ "$USECOLOR" = "YES" -o "$USECOLOR" = "yes" ]; then
@@ -36,8 +33,8 @@ error() {
 }
 
 # determine current USECOLOR setting
-#[ -f "/etc/rc.conf" ] && source /etc/rc.conf
-#[ -f "/etc/rc.d/functions" ] && source /etc/rc.d/functions
+[ -f "/etc/rc.conf" ] && source /etc/rc.conf
+[ -f "/etc/rc.d/functions" ] && source /etc/rc.d/functions
 
 usage() {
 	echo "pacman-optimize (pacman) $myver"