From f3836ff8e8f3dbb25b8b5161a14004a5fc08554a Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 29 May 2007 17:46:20 -0400 Subject: 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 --- scripts/pacman-optimize.in | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'scripts/pacman-optimize.in') 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" -- cgit v1.2.3