summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorZdenek Prikryl <zprikryl@redhat.com>2009-06-17 16:23:08 +0200
committerZdenek Prikryl <zprikryl@redhat.com>2009-06-17 16:23:08 +0200
commit5d157e341fed5782c1fbfdd5f820a8d349824e84 (patch)
treedef00b43941b209e2fcc4719018193e6c8753ada /src
parentf31ebd2e0aafc9404c95b8fe92a02d58216f918d (diff)
downloadabrt-5d157e341fed5782c1fbfdd5f820a8d349824e84.tar.gz
abrt-5d157e341fed5782c1fbfdd5f820a8d349824e84.tar.xz
abrt-5d157e341fed5782c1fbfdd5f820a8d349824e84.zip
new default path for lock file
Diffstat (limited to 'src')
-rw-r--r--src/Daemon/CrashWatcher.cpp4
-rw-r--r--src/Daemon/Makefile.am6
2 files changed, 6 insertions, 4 deletions
diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp
index 0112c73..2670ce8 100644
--- a/src/Daemon/CrashWatcher.cpp
+++ b/src/Daemon/CrashWatcher.cpp
@@ -33,6 +33,8 @@
#include <cstring>
#include "ABRTException.h"
+#define VAR_RUN_LOCK_FILE VAR_RUN"/abrt.lock"
+
/* just a helper function
template< class T >
std::string
@@ -485,7 +487,7 @@ void CCrashWatcher::FindNewDumps(const std::string& pPath)
void CCrashWatcher::Lock()
{
- int lfp = open((std::string(VAR_RUN) + "abrt.lock").c_str(),O_RDWR|O_CREAT,0640);
+ int lfp = open(VAR_RUN_LOCK_FILE, O_RDWR|O_CREAT,0640);
if (lfp < 0)
{
throw CABRTException(EXCEP_FATAL, "CCrashWatcher::Lock(): can not open lock file");
diff --git a/src/Daemon/Makefile.am b/src/Daemon/Makefile.am
index 4af30fd..998168e 100644
--- a/src/Daemon/Makefile.am
+++ b/src/Daemon/Makefile.am
@@ -2,13 +2,13 @@ sbin_PROGRAMS = abrt
abrt_SOURCES = CrashWatcher.cpp CrashWatcher.h Daemon.cpp DBusServerProxy.h \
DBusCommon.h Settings.h Settings.cpp
abrt_CPPFLAGS = -I$(srcdir)/../../lib/MiddleWare -I$(srcdir)/../../lib/CommLayer\
- -I$(srcdir)/../../inc -I$(srcdir)/../../lib/Utils\
+ -I$(srcdir)/../../inc -I$(srcdir)/../../lib/Utils \
-DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" $(GLIB_CFLAGS) $(DBUSCPP_CFLAGS) \
-DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
-DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
-DCONF_DIR=\"$(CONF_DIR)\" \
- -DVAR_RUN=\"$(VAR_RUN)\" \
- $(ENABLE_SOCKET_OR_DBUS)
+ -DVAR_RUN=\"$(VAR_RUN)\" $(ENABLE_SOCKET_OR_DBUS)
+
abrt_LDADD = ../../lib/MiddleWare/libABRTMiddleWare.la ../../lib/CommLayer/libABRTCommLayer.la $(DL_LIBS) $(DBUSCPP_LIBS) $(RPM_LIBS)
dbusabrtconfdir = ${sysconfdir}/dbus-1/system.d/
dist_dbusabrtconf_DATA = dbus-abrt.conf