From 3d478b6e27b76f628939bf07ce05852fd861a7a7 Mon Sep 17 00:00:00 2001
From: Marcela Rosales <marcela.a.rosales.jimenez@intel.com>
Date: Fri, 1 Feb 2019 12:48:38 -0600
Subject: [PATCH] Standardizing Makefile install target name for
 service-mgmt/sm

Change-Id: I0b4a5aa7d498a49550c5890a79d7ff8edeae148d
Story: 2004043
Task: 27540
Signed-off-by: Marcela Rosales <marcela.a.rosales.jimenez@intel.com>
---
 service-mgmt/sm-1.0.0/Makefile         |  2 +-
 service-mgmt/sm-1.0.0/centos/sm.spec   | 20 ++------------------
 service-mgmt/sm-1.0.0/scripts/Makefile |  2 +-
 service-mgmt/sm-1.0.0/src/Makefile     |  2 +-
 4 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/service-mgmt/sm-1.0.0/Makefile b/service-mgmt/sm-1.0.0/Makefile
index fe76b58e..b1ba3519 100644
--- a/service-mgmt/sm-1.0.0/Makefile
+++ b/service-mgmt/sm-1.0.0/Makefile
@@ -6,7 +6,7 @@
 build:
 	@(cd src; make build )
 
-install_non_bb:
+install:
 	@(cd src; make $@)
 	@(cd scripts; make $@)
 
diff --git a/service-mgmt/sm-1.0.0/centos/sm.spec b/service-mgmt/sm-1.0.0/centos/sm.spec
index c8ccd171..27f97f37 100644
--- a/service-mgmt/sm-1.0.0/centos/sm.spec
+++ b/service-mgmt/sm-1.0.0/centos/sm.spec
@@ -59,10 +59,10 @@ MAJOR=`echo $VER | awk -F . '{print $1}'`
 make -j"%(nproc)"
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 VER=%{version}
 MAJOR=`echo $VER | awk -F . '{print $1}'`
-make DEST_DIR=$RPM_BUILD_ROOT UNIT_DIR=%{_unitdir} install_non_bb
+make DEST_DIR=%{buildroot} UNIT_DIR=%{_unitdir} install
 
 %post
 /usr/bin/systemctl enable sm.service >/dev/null 2>&1
@@ -81,19 +81,3 @@ make DEST_DIR=$RPM_BUILD_ROOT UNIT_DIR=%{_unitdir} install_non_bb
 "/etc/init.d/sm-shutdown"
 "/etc/pmon.d/sm.conf"
 "/etc/logrotate.d/sm.logrotate"
-
-#%files -n sm-dbg
-#%defattr(-,-,-,-)
-#%dir "/usr"
-#%dir "/usr/bin"
-#%dir "/usr/src"
-#%dir "/usr/bin/.debug"
-#"/usr/bin/.debug/sm"
-#%dir "/usr/src/debug"
-#%dir "/usr/src/debug/sm"
-#%dir "/usr/src/debug/sm/1.0.0-r10"
-#%dir "/usr/src/debug/sm/1.0.0-r10/src"
-#/usr/src/debug/sm/1.0.0-r10/src/*.c
-#/usr/src/debug/sm/1.0.0-r10/src/*.h
-
-
diff --git a/service-mgmt/sm-1.0.0/scripts/Makefile b/service-mgmt/sm-1.0.0/scripts/Makefile
index 6471cf35..cbaa6b7f 100644
--- a/service-mgmt/sm-1.0.0/scripts/Makefile
+++ b/service-mgmt/sm-1.0.0/scripts/Makefile
@@ -1,4 +1,4 @@
-install_non_bb:
+install:
 	install -d ${DEST_DIR}/etc/init.d
 	install sm ${DEST_DIR}/etc/init.d/sm
 	install sm.shutdown ${DEST_DIR}/etc/init.d/sm-shutdown
diff --git a/service-mgmt/sm-1.0.0/src/Makefile b/service-mgmt/sm-1.0.0/src/Makefile
index 045da615..dde94ae7 100644
--- a/service-mgmt/sm-1.0.0/src/Makefile
+++ b/service-mgmt/sm-1.0.0/src/Makefile
@@ -130,7 +130,7 @@ LDFLAGS = -rdynamic
 build: $(OBJS)
 	$(CXX) $(CCFLAGS) $(EXTRACCFLAGS) $(OBJS) ${LDFLAGS} $(LDLIBS) -o sm
 
-install_non_bb:
+install:
 	install -d 755 ${DEST_DIR}/usr/bin
 	install -m 755 sm ${DEST_DIR}/usr/bin/sm