Makefile.am: fix install of misc/rasdaemon.env

The logic added by the previous patch didn't work properly.

Change it to pack misc/rasdaemon.env when creating a
tarball and install it via "make install" target.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/Makefile.am b/Makefile.am
index 51ef4debe0e19196d7f8a077a6f25e92cbdaaac9..f4822b926fa7d3884a25393a1794962f3a08aff3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS=-I m4
 SUBDIRS = libtrace util man
 SYSTEMD_SERVICES_IN = misc/rasdaemon.service.in misc/ras-mc-ctl.service.in
 SYSTEMD_SERVICES = $(SYSTEMD_SERVICES_IN:.service.in=.service)
-EXTRA_DIST = $(SYSTEMD_SERVICES_IN)
+EXTRA_DIST = $(SYSTEMD_SERVICES_IN) misc/rasdaemon.env
 
 # This rule is needed because \@sbindir\@ is expanded to \${exec_prefix\}/sbin
 # during ./configure phase, therefore it is not possible to add .service.in
@@ -90,3 +90,6 @@ upload:
 install-data-local:
        $(install_sh) -d "$(DESTDIR)@RASSTATEDIR@"
        $(install_sh) -d "$(DESTDIR)@sysconfdir@/ras/dimm_labels.d"
+if WITH_MEMORY_CE_PFA
+       $(install_sh) @abs_srcdir@/misc/rasdaemon.env "$(DESTDIR)@sysconfdir@/sysconfig/rasdaemon"
+endif

diff --git a/misc/rasdaemon.spec.in b/misc/rasdaemon.spec.in
index e54acabda43154e6d13041680331d5034f03f964..b2572f5d9405acb0b8b13005befe824c4e31daff 100644 (file)
--- a/misc/rasdaemon.spec.in
+++ b/misc/rasdaemon.spec.in
@@ -44,7 +44,6 @@ make %{?_smp_mflags}
 
 %install
 make install DESTDIR=%{buildroot}
-install -D -p -m 0644 misc/rasdaemon.env %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 install -D -p -m 0644 misc/rasdaemon.service %{buildroot}/%{_unitdir}/rasdaemon.service
 install -D -p -m 0644 misc/ras-mc-ctl.service %{buildroot}%{_unitdir}/ras-mc-ctl.service
 rm INSTALL %{buildroot}/usr/include/*.h
@@ -57,6 +56,7 @@ rm INSTALL %{buildroot}/usr/include/*.h
 %{_unitdir}/*.service
 %{_sharedstatedir}/rasdaemon
 %{_sysconfdir}/ras/dimm_labels.d
+%{_sysconfdir}/sysconfig/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 
 %changelog