From 5fb98cd022672d6608f09bf3acf3f5600c96cf8c Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Sat, 8 Jan 2011 19:35:05 +0100 Subject: [PATCH] pid file: small compile fixes + rclmon.sh stop now works --- src/index/rclmon.sh | 4 ++-- src/utils/Makefile | 2 +- src/utils/pathut.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/index/rclmon.sh b/src/index/rclmon.sh index d8a129bb..f1655741 100755 --- a/src/index/rclmon.sh +++ b/src/index/rclmon.sh @@ -19,7 +19,7 @@ ################### # Start/stop a recollindex program running as permanent real time indexer. -# The running program writes its pid in $RECOLL_CONFDIR/rclmonpid +# The running program writes its pid in $RECOLL_CONFDIR/index.pid # The portability of this script has not been fully tested. # @@ -40,7 +40,7 @@ export LANG=C RECOLL_CONFDIR=${RECOLL_CONFDIR:-$HOME/.recoll} #echo RECOLL_CONFDIR = ${RECOLL_CONFDIR} -pidfile="${RECOLL_CONFDIR}/rclmonpid" +pidfile="${RECOLL_CONFDIR}/index.pid" opid=0 diff --git a/src/utils/Makefile b/src/utils/Makefile index 7fb2c01c..b2cba3eb 100644 --- a/src/utils/Makefile +++ b/src/utils/Makefile @@ -50,7 +50,7 @@ trmd5.o : md5.cpp md5.h PATHUT_OBJS= trpathut.o $(BIGLIB) trpathut : $(PATHUT_OBJS) - $(CXX) $(ALL_CXXFLAGS) -o trpathut $(PATHUT_OBJS) $(LIBICONV) + $(CXX) $(ALL_CXXFLAGS) -o trpathut $(PATHUT_OBJS) $(LIBICONV) $(LIBSYS) trpathut.o : pathut.cpp pathut.h $(CXX) -o trpathut.o -c $(ALL_CXXFLAGS) -DTEST_PATHUT pathut.cpp diff --git a/src/utils/pathut.cpp b/src/utils/pathut.cpp index 24641133..9e1a57b7 100644 --- a/src/utils/pathut.cpp +++ b/src/utils/pathut.cpp @@ -548,7 +548,7 @@ int Pidfile::remove() } #else // TEST_PATHUT - +#include #include using namespace std;