From ff2800d9fec0f3821f27f573548590d9752e8777 Mon Sep 17 00:00:00 2001
From: Erich Cordoba <erich.cordoba.malibran@intel.com>
Date: Tue, 30 Oct 2018 10:42:36 -0600
Subject: [PATCH] Standardize makefile in snmp-audittrail.

The target of install_non_bb was changed to install. The variables
were set to default values inside the makefile. All changes were
updated in the specfile as well.

An issue with an empty PATCH variable was fixed and the StarlingX
was updated.

Story: 2004043
Task: 27546

Change-Id: I5f2f8a0d681b106691f2cbf8b0a7a27977452edc
Signed-off-by: Erich Cordoba <erich.cordoba.malibran@intel.com>
---
 snmp-audittrail/centos/snmp-audittrail.spec | 18 ++++++++----------
 snmp-audittrail/sources/Makefile            | 15 ++++++++++-----
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/snmp-audittrail/centos/snmp-audittrail.spec b/snmp-audittrail/centos/snmp-audittrail.spec
index a4905f35..fd4ede03 100644
--- a/snmp-audittrail/centos/snmp-audittrail.spec
+++ b/snmp-audittrail/centos/snmp-audittrail.spec
@@ -1,4 +1,4 @@
-Summary: Titanium Cloud Platform SNMP Audit Trail
+Summary: StarlingX SNMP Audit Trail
 Name: snmp-audittrail
 Version: 1.0
 Release: %{tis_patch_ver}%{?_tis_dist}
@@ -16,18 +16,18 @@ Requires: net-snmp
 Requires: uuid
 
 %description
-Titanium Cloud platform SNMP Audit Trail provides audit trail support for incoming
+StarlingX SNMP Audit Trail provides audit trail support for incoming
 SNMP requests.
 
 %package -n snmp-audittrail-devel
-Summary: Titanium Cloud Platform SNMP Audit Trail Package - Development files
+Summary: StarlingX SNMP Audit Trail Package - Development files
 Group: devel
 Requires: snmp-audittrail = %{version}-%{release}
 
 %description -n snmp-audittrail-devel
-Titanium Cloud platform SNMP Audit Trail provides audit trail support for incoming
-SNMP requests.  This package contains symbolic links, header files, and related
-items necessary for software development.
+StarlingX SNMP Audit Trail provides audit trail support for incoming SNMP requests.
+This package contains symbolic links, header files, and related items necessary
+for software development.
 
 %prep
 %setup
@@ -36,16 +36,14 @@ items necessary for software development.
 VER=%{version}
 MAJOR=`echo $VER | awk -F . '{print $1}'`
 MINOR=`echo $VER | awk -F . '{print $2}'`
-PATCHVER=` echo %{release} | awk -F r '{print $2}' | awk -F . '{print $1}'`
-make  MAJOR=$MAJOR MINOR=$MINOR PATCH=$PATCHVER %{?_smp_mflags}
+make MAJOR=$MAJOR MINOR=$MINOR PATCH=%{tis_patch_ver} %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 VER=%{version}
 MAJOR=`echo $VER | awk -F . '{print $1}'`
 MINOR=`echo $VER | awk -F . '{print $2}'`
-PATCHVER=` echo %{release} | awk -F r '{print $2}' | awk -F . '{print $1}'`
-make DEST_DIR=$RPM_BUILD_ROOT LIB_DIR=%{_libdir} MAJOR=$MAJOR MINOR=$MINOR PATCH=$PATCHVER install_non_bb
+make install DESTDIR=$RPM_BUILD_ROOT LIB_DIR=%{_libdir} MAJOR=$MAJOR MINOR=$MINOR PATCH=%{tis_patch_ver}
 
 %files
 %defattr(-,root,root,-)
diff --git a/snmp-audittrail/sources/Makefile b/snmp-audittrail/sources/Makefile
index 7803c59d..ad00ce66 100644
--- a/snmp-audittrail/sources/Makefile
+++ b/snmp-audittrail/sources/Makefile
@@ -5,6 +5,11 @@ LDLIBS = -lfmcommon -lnetsnmp -lnetsnmpagent -luuid
 INCLUDES += -I./
 CCFLAGS = -fPIC -g -O2 -Wall -Werror
 LIBCGTSAGENT_SO := libsnmpAuditPlugin.so
+MAJOR ?= 1
+MINOR ?= 0
+PATCH ?= 0
+DESTDIR ?= /usr/lib64
+
 build: lib
 
 .c.o:
@@ -18,8 +23,8 @@ lib: $(OBJS)
 clean:
 	@rm -f $(OBJ) *.o *.so.*
 
-install_non_bb:
-	install -m 755 -d $(DEST_DIR)$(LIB_DIR)
-	install -m 755 $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(DEST_DIR)$(LIB_DIR)
-	ln -s $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(DEST_DIR)$(LIB_DIR)/$(LIBCGTSAGENT_SO).$(MAJOR)
-	ln -s $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(DEST_DIR)$(LIB_DIR)/$(LIBCGTSAGENT_SO)
+install:
+	install -m 755 -d $(DESTDIR)$(LIB_DIR)
+	install -m 755 $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(DESTDIR)$(LIB_DIR)
+	ln -s $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(DESTDIR)$(LIB_DIR)/$(LIBCGTSAGENT_SO).$(MAJOR)
+	ln -s $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(DESTDIR)$(LIB_DIR)/$(LIBCGTSAGENT_SO)