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>

2 files changed, 8 insertions, 11 deletions

diff --git a/scripts/makepkg.in b/scripts/makepkg.in
index 2884e5db..0743b8fc 100644
--- a/scripts/makepkg.in
+++ b/scripts/makepkg.in
@@ -578,7 +578,7 @@ create_package() {
 	# tar it up
 	msg2 "$(gettext "Compressing package...")"
 
-	local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT}"
+	local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}"
 	comp_files="$comp_files .PKGINFO .FILELIST"
 
 	if ! tar -czf "$pkg_file" $comp_files *; then
@@ -590,11 +590,11 @@ create_package() {
 installpackage() {
 	if [ "$INSTALL" = "1" -a "$SUDO" = "1" ]; then
 		msg "$(gettext "Installing package with pacman -U...")"
-		sudo pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT}
+		sudo pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
 		exit $?
 	elif [ "$INSTALL" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" ]; then
 		msg "$(gettext "Installing package with pacman -U...")"
-		pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT}
+		pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
 		exit $?
 	fi
 }
@@ -864,7 +864,7 @@ if [ "$install" -a ! -f "$install" ]; then
 	exit 1
 fi
 
-if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT}" \
+if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \
      -a "$FORCE" = "0" -a "$GENINTEG" = "0" ]; then
 	if [ "$INSTALL" = "1" ]; then
 		warning "$(gettext "a package has already been built, installing existing package.")"
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"