Move service configuration under control of automake

This is necessary service configuration and it needs
to be kept together with rest of dlog.  Additionally,
it will be needed in further commits to pre-process
the service files according to ./configure flags/conf.

Change-Id: Ia52d395406135c9a14310e2fad5d9d653e472968

diff --git a/Makefile.am b/Makefile.am
index e9c51bb..48023b3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -183,6 +183,11 @@ pkgconfig_DATA = dlog.pc
 
 data_DATA = configs/dlog.conf.test
 
+unitdir = $(prefix)/lib/systemd/system
+unit_DATA = configs/dlog_logger.service \
+       configs/dlog_logger.path \
+       configs/dlog_dev-log.socket
+
 bin_SCRIPTS = dlog_test_pipe
 
 dox::

diff --git a/packaging/dlog_dev-log.socket b/configs/dlog_dev-log.socket
similarity index 100%
rename from packaging/dlog_dev-log.socket
rename to configs/dlog_dev-log.socket

diff --git a/packaging/dlog_logger.path b/configs/dlog_logger.path
similarity index 100%
rename from packaging/dlog_logger.path
rename to configs/dlog_logger.path

diff --git a/packaging/dlog_logger.service b/configs/dlog_logger.service
similarity index 100%
rename from packaging/dlog_logger.service
rename to configs/dlog_logger.service

diff --git a/packaging/dlog.spec b/packaging/dlog.spec
index cf2a754..0cda6bd 100644 (file)
--- a/packaging/dlog.spec
+++ b/packaging/dlog.spec
@@ -6,10 +6,7 @@ Group:      System/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source101:  packaging/dlog.manifest
-Source301:  packaging/dlog_logger.service
-Source302:  packaging/dlog_logger.path
 Source501:  packaging/01-dlog.rules
-Source666:  packaging/dlog_dev-log.socket
 
 %define upgrade_file_path %{_datadir}/upgrade
 
@@ -118,10 +115,6 @@ install -m 0644 configs/dlog.conf.logger %{buildroot}%{TZ_SYS_ETC}/dlog.conf.log
 
 mkdir -p %{buildroot}%{_unitdir}/basic.target.wants/
 mkdir -p %{buildroot}%{_unitdir}/sockets.target.wants/
-install -m 0644 %SOURCE301 %{buildroot}%{_unitdir}
-install -m 0644 %SOURCE666 %{buildroot}%{_unitdir}
-
-install -m 0644 %SOURCE302 %{buildroot}%{_unitdir}/dlog_logger.path
 ln -s ../dlog_logger.service %{buildroot}%{_unitdir}/basic.target.wants/dlog_logger.service
 ln -s ../dlog_dev-log.socket %{buildroot}%{_unitdir}/sockets.target.wants/dlog_dev-log.socket