diff options
| -rw-r--r-- | abrt.spec | 6 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | lib/Plugins/Makefile.am | 5 | ||||
| -rw-r--r-- | lib/Utils/Makefile.am | 9 |
4 files changed, 21 insertions, 8 deletions
@@ -4,7 +4,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 1.0.0 -Release: 1%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ @@ -278,8 +278,7 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-%{name}.conf %{_initrddir}/%{name}d -%dir %attr(0775, root, abrt) /var/cache/%{name} -%dir /var/cache/%{name}-di +%dir %attr(0775, root, abrt) %{_localstatedir}/cache/%{name} %dir /var/run/%{name} %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/plugins @@ -315,6 +314,7 @@ fi %files addon-ccpp %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp.conf +%dir %{_localstatedir}/cache/%{name}-di %{_libdir}/%{name}/libCCpp.so* %{_libexecdir}/abrt-hook-ccpp diff --git a/configure.ac b/configure.ac index d1171732..dcd0030e 100644 --- a/configure.ac +++ b/configure.ac @@ -54,10 +54,18 @@ PLUGINS_LIB_DIR='${libdir}/${PACKAGE_NAME}' ENABLE_SOCKET_OR_DBUS='-DENABLE_DBUS=1' DEBUG_DUMPS_DIR='${localstatedir}/cache/${PACKAGE_NAME}' +DEBUG_INFO_DIR='${localstatedir}/cache/${PACKAGE_NAME}-di' + AC_ARG_WITH(debugdumpsdir, [AS_HELP_STRING([--with-debugdumpdir=DIR], [Directory where debugdumps are created])], [DEBUG_DUMPS_DIR="$withval"]) + +AC_ARG_WITH(debuginfosdir, + [AS_HELP_STRING([--with-debuginfodir=DIR], + [Directory where debuginfo is stored])], + [DEBUG_INFO_DIR="$withval"]) + AC_ARG_ENABLE(socket, [AC_HELP_STRING([--enable-socket], @@ -75,6 +83,7 @@ AC_SUBST(VAR_RUN) AC_SUBST(PLUGINS_CONF_DIR) AC_SUBST(PLUGINS_LIB_DIR) AC_SUBST(DEBUG_DUMPS_DIR) +AC_SUBST(DEBUG_INFO_DIR) AC_SUBST(DL_LIBS, -ldl) AC_CONFIG_HEADERS([config.h]) diff --git a/lib/Plugins/Makefile.am b/lib/Plugins/Makefile.am index 58f1334d..5149ebae 100644 --- a/lib/Plugins/Makefile.am +++ b/lib/Plugins/Makefile.am @@ -40,8 +40,11 @@ man_MANS = abrt-FileTransfer.7 abrt-Bugzilla.7 abrt-KerneloopsReporter.7 \ # + abrt-Catcut.7 EXTRA_DIST = $(man_MANS) + +$(DESTDIR)/$(DEBUG_INFO_DIR): + $(mkdir_p) '$@' -install-data-hook: +install-data-hook: $(DESTDIR)/$(DEBUG_INFO_DIR) chmod 0600 $(DESTDIR)$(sysconfdir)/abrt/plugins/Bugzilla.conf sed 's: = /var/: = $(localstatedir)/:g' -i \ $(DESTDIR)$(sysconfdir)/abrt/plugins/SQLite3.conf \ diff --git a/lib/Utils/Makefile.am b/lib/Utils/Makefile.am index 427e437c..297007a9 100644 --- a/lib/Utils/Makefile.am +++ b/lib/Utils/Makefile.am @@ -66,7 +66,8 @@ libABRTdUtils_la_LIBADD = \ $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) \ $(POLKIT_LIBS) - -install-data-local: - $(mkdir_p) '$(DESTDIR)/$(DEBUG_DUMPS_DIR)' - chmod 1777 '$(DESTDIR)/$(DEBUG_DUMPS_DIR)' +$(DESTDIR)/$(DEBUG_DUMPS_DIR): + $(mkdir_p) '$@' +# no need to chmod it here +#chmod 1777 '$@' +install-data-local: $(DESTDIR)/$(DEBUG_DUMPS_DIR) |