diff options
| author | Zdenek Prikryl <zprikryl@redhat.com> | 2009-06-17 15:57:43 +0200 |
|---|---|---|
| committer | Zdenek Prikryl <zprikryl@redhat.com> | 2009-06-17 15:57:43 +0200 |
| commit | 121e36536d05b32af17af3d513ffc96548d84381 (patch) | |
| tree | f966c3c68041390eacf088e59e12be8dc2015e54 | |
| parent | 5b82ef1f0e5ff106c097b85b00e46708c1403453 (diff) | |
| parent | f40786b625c2e0298fdce567372a5a7afe105b83 (diff) | |
| download | abrt-121e36536d05b32af17af3d513ffc96548d84381.tar.gz abrt-121e36536d05b32af17af3d513ffc96548d84381.tar.xz abrt-121e36536d05b32af17af3d513ffc96548d84381.zip | |
Merge branch 'master' of git://git.fedorahosted.org/abrt
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/Daemon/CrashWatcher.cpp | 2 | ||||
| -rw-r--r-- | src/Daemon/Makefile.am | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index ee521e0e..3a2e624d 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,7 @@ AC_CHECK_HEADER([magic.h], [], [AC_MSG_ERROR([magic.h is needed to build abrt])]) CONF_DIR='${sysconfdir}/${PACKAGE_NAME}' +VAR_RUN = '${localstatedir}/run' PLUGINS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/plugins' PLUGINS_LIB_DIR='${libdir}/${PACKAGE_NAME}' ENABLE_SOCKET_OR_DBUS='-DENABLE_DBUS=1' diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp index 41028d20..0112c736 100644 --- a/src/Daemon/CrashWatcher.cpp +++ b/src/Daemon/CrashWatcher.cpp @@ -485,7 +485,7 @@ void CCrashWatcher::FindNewDumps(const std::string& pPath) void CCrashWatcher::Lock() { - int lfp = open("/var/run/abrt.lock",O_RDWR|O_CREAT,0640); + int lfp = open((std::string(VAR_RUN) + "abrt.lock").c_str(),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 4d9bed56..4af30fd2 100644 --- a/src/Daemon/Makefile.am +++ b/src/Daemon/Makefile.am @@ -7,6 +7,7 @@ abrt_CPPFLAGS = -I$(srcdir)/../../lib/MiddleWare -I$(srcdir)/../../lib/CommLayer -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ -DCONF_DIR=\"$(CONF_DIR)\" \ + -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/ |