Install configuration files in Makefile instead of spec

Change-Id: Ib3c754f692965ab2e8c02eded74f35fb866d709f
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>

diff --git a/Makefile.am b/Makefile.am
index e552a8b0b68326ee6f8bb01dff214337eb133b81..7bc7ffb8712e25356b22d460c62ae13f61ec999a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 EXTRA_DIST =
-CLEANFILES =
+CLEANFILES = $(BUILT_SOURCES)
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 AM_MAKEFLAGS = --no-print-directory
 
@@ -38,8 +38,16 @@ SED_PROCESS = \
         -e 's,@sbindir\@,$(sbindir),g' \
        < $< > $@ || rm $@
 
-%.pc: %.pc.in Makefile
-       $(SED_PROCESS)
+unitdir = $(prefix)/lib/systemd/system
+configdir = $(sysconfdir)/faultd
+serviceconfigdir = $(configdir)/conf.d
+
+nodist_unit_DATA = \
+    faultd.service
+
+serviceconfig_DATA = \
+    conf.d/dbus.service.conf \
+    conf.d/display-manager.service.conf
 
 sbin_PROGRAMS = faultd
 faultd_SOURCES = \
@@ -72,6 +80,9 @@ faultd_SOURCES = \
     src/util/systemd_dbus.c
 faultd_LDADD = $(LIBSYSTEMD_LIBS) $(AUDIT_LIBS) $(LIBEJDB_LIBS) $(JSON_C_LIBS)
 
+%.pc: %.pc.in Makefile
+       $(SED_PROCESS)
+
 %.service: %.service.in Makefile
        $(SED_PROCESS)
 
@@ -81,11 +92,15 @@ bin_PROGRAMS = leaker
 leaker_SOURCES = \
     tests/leaker.c
 
+serviceconfig_DATA += \
+    tests/faultd-failed.service.conf \
+    tests/faultd-leaker.service.conf
+
 TEST_UNIT_FILES = \
     tests/faultd-leaker.service \
     tests/faultd-failed.service
 
-BUILT_SOURCES = $(TEST_UNIT_FILES)
-CLEANFILES = $(TEST_UNIT_FILES)
+nodist_unit_DATA += $(TEST_UNIT_FILES)
 endif
 
+CLEANFILES += $(nodist_unit_DATA)

diff --git a/faultd.service.in b/faultd.service.in
new file mode 100644 (file)
index 0000000..3f7ce61
--- /dev/null
+++ b/faultd.service.in
@@ -0,0 +1,8 @@
+[Unit]
+Description=Service Monitoring
+
+[Service]
+ExecStart=@sbindir@/faultd
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file

diff --git a/packaging/faultd.spec b/packaging/faultd.spec
index 04702883f309cf37e0d5d48fa528f472e948dac4..959f8eaa506566d9d3f905d5add44c5b06946382 100644 (file)
--- a/packaging/faultd.spec
+++ b/packaging/faultd.spec
@@ -33,15 +33,8 @@ make %{?_smp_mflags}
 
 %install
 %make_install
-mkdir -p %{buildroot}/%{_unitdir}/
-cp tests/faultd-leaker.service %{buildroot}/%{_unitdir}/
-cp tests/faultd-failed.service %{buildroot}/%{_unitdir}/
 
 mkdir -p %{buildroot}/%{_sysconfdir}/faultd/conf.d/
-cp tests/faultd-leaker.service.conf %{buildroot}/%{_sysconfdir}/faultd/conf.d/
-cp tests/faultd-failed.service.conf %{buildroot}/%{_sysconfdir}/faultd/conf.d/
-cp conf.d/dbus.service.conf %{buildroot}/%{_sysconfdir}/faultd/conf.d/
-cp conf.d/display-manager.service.conf %{buildroot}/%{_sysconfdir}/faultd/conf.d/
 
 %files
 %license COPYING
@@ -49,6 +42,7 @@ cp conf.d/display-manager.service.conf %{buildroot}/%{_sysconfdir}/faultd/conf.d
 %{_sbindir}/faultd
 %{_sysconfdir}/faultd/conf.d/dbus.service.conf
 %{_sysconfdir}/faultd/conf.d/display-manager.service.conf
+%{_unitdir}/faultd.service
 
 %files test-programs
 %{_bindir}/leaker