Merged trunk changes r9797:9829 into 217update branch.
--- scrollkeeper-0.3.14.orig/scripts/scrollkeeper-rebuilddb.in Wed Apr 17 02:28:26 2002
+++ scrollkeeper-0.3.14/scripts/scrollkeeper-rebuilddb.in Sun Feb 15 06:40:28 2004
@@ -2,6 +2,7 @@
prefix=@prefix@
localstatedir=@localstatedir@
+logdir=$localstatedir/log
usage()
{
@@ -18,9 +19,10 @@
verbose=""
quiet=""
-while getopts "p:qv" opt; do
+while getopts "p:l:qv" opt; do
case $opt in
p ) scrollkeeper_db_dir=$OPTARG ;;
+ l ) logdir=$OPTARG ;;
q ) quiet="-q" ;;
v ) verbose="-v" ;;
\? ) usage 1 ;;
@@ -31,8 +33,8 @@
datestring=`date +"%b %d %X"`
if [ -z "$scrollkeeper_db_dir" ]; then
- echo "$datestring scrollkeeper-rebuilddb: Empty database path returned from scrollkeeper-config." >> @localstatedir@/log/scrollkeeper.log
- echo "$datestring scrollkeeper-rebuilddb: Cannot rebuild ScrollKeeper database." >> @localstatedir@/log/scrollkeeper.log
+ echo "$datestring scrollkeeper-rebuilddb: Empty database path returned from scrollkeeper-config." >> $logdir/scrollkeeper.log
+ echo "$datestring scrollkeeper-rebuilddb: Cannot rebuild ScrollKeeper database." >> $logdir/scrollkeeper.log
if [ ! $quiet ] || [ $quiet != "-q" ]; then
echo "scrollkeeper-rebuilddb: Empty database path returned from scrollkeeper-config."
echo "scrollkeeper-rebuilddb: Cannot rebuild ScrollKeeper database."
@@ -42,11 +44,11 @@
rm -rf $scrollkeeper_db_dir
fi
-echo "$datestring scrollkeeper-rebuilddb: Rebuilding ScrollKeeper database..." >> @localstatedir@/log/scrollkeeper.log
+echo "$datestring scrollkeeper-rebuilddb: Rebuilding ScrollKeeper database..." >> $logdir/scrollkeeper.log
scrollkeeper-update $quiet $verbose -p $scrollkeeper_db_dir
datestring=`date +"%b %d %X"`
-echo "$datestring scrollkeeper-rebuilddb: Done rebuilding ScrollKeeper database." >> @localstatedir@/log/scrollkeeper.log
+echo "$datestring scrollkeeper-rebuilddb: Done rebuilding ScrollKeeper database." >> $logdir/scrollkeeper.log
exit 0
--- scrollkeeper-0.3.14.orig/Makefile.am Sat Dec 6 08:16:48 2003
+++ scrollkeeper-0.3.14/Makefile.am Sun Feb 15 06:41:27 2004
@@ -35,7 +35,7 @@
PATH="$(PATH):$(DESTDIR)$(bindir)" ; \
echo "`date +\"%b %d %X\"` Installing ScrollKeeper `scrollkeeper-config --version`..." >> $(DESTDIR)$(localstatedir)/log/scrollkeeper.log
PATH="$(PATH):$(DESTDIR)$(bindir)" ; \
- $(DESTDIR)$(bindir)/scrollkeeper-rebuilddb -q -p $(DESTDIR)$(scrollkeeper_localstate_dir)
+ $(DESTDIR)$(bindir)/scrollkeeper-rebuilddb -q -p $(DESTDIR)$(scrollkeeper_localstate_dir) -l $(DESTDIR)$(localstatedir)/log
# Remove generated files
uninstall-local: