Fix problem from make dist-rpm

rasdaemon rpm package can't build out and report the files should start
from "/".

Update the Makefile by adding "" to folder name and change one
typo.

Signed-off-by: Jason Tian <jason@os.amperecomputing.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/Makefile.am b/Makefile.am
index 37a1283fba0806fad2dec78abfd87a984ac88071..de010984001757930d96133e216222aac1dbbac3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,7 +62,8 @@ rasdaemon_LDADD = -lpthread $(SQLITE3_LIBS) libtrace/libtrace.a
 include_HEADERS = config.h  ras-events.h  ras-logger.h  ras-mc-handler.h \
                  ras-aer-handler.h ras-mce-handler.h ras-record.h bitfield.h ras-report.h \
                  ras-extlog-handler.h ras-arm-handler.h ras-non-standard-handler.h \
-                 ras-devlink-handler.h ras-diskerror-handler.h rbtree.h ras-page-isolation.h
+                 ras-devlink-handler.h ras-diskerror-handler.h rbtree.h ras-page-isolation.h \
+                 non-standard-hisilicon.h
 
 # This rule can't be called with more than one Makefile job (like make -j8)
 # I can't figure out a way to fix that

diff --git a/configure.ac b/configure.ac
index 318b1e6cb07ad62c344fc4a3a4c44c871b782e45..e276c8407f1dfd4bd8fe6525f4fb6a1953fdb945 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -152,7 +152,7 @@ AC_SUBST([RASSTATEDIR])
 AC_ARG_WITH(sysconfdefdir,
     AC_HELP_STRING([--with-sysconfdefdir=DIR], [rasdaemon environment file dir]),
     [SYSCONFDEFDIR=$withval],
-    [/etc/sysconfig])
+    ["/etc/sysconfig"])
 AC_SUBST([SYSCONFDEFDIR])
 
 AC_DEFINE([RAS_DB_FNAME], ["ras-mc_event.db"], [ras events database])

diff --git a/misc/rasdaemon.spec.in b/misc/rasdaemon.spec.in
index 01e69fc1b9b1f50abb510d57c947878d3615cf58..5f02f2c9d810c0fdcb82571f1a09eb8b5a95057d 100644 (file)
--- a/misc/rasdaemon.spec.in
+++ b/misc/rasdaemon.spec.in
@@ -57,7 +57,7 @@ rm INSTALL %{buildroot}/usr/include/*.h
 %{_sharedstatedir}/rasdaemon
 %{_sysconfdir}/ras/dimm_labels.d
 @SYSCONFDEFDIR@/%{name}
-%config(noreplace) @SYSCONFDIFDIR@/%{name}
+%config(noreplace) @SYSCONFDEFDIR@/%{name}
 
 %changelog