Merge "Standardizing Makefile install target name for service-mgmt/sm"

This commit is contained in:
Zuul 2019-02-04 23:12:33 +00:00 committed by Gerrit Code Review
commit 4851c8658a
4 changed files with 5 additions and 21 deletions

View File

@ -6,7 +6,7 @@
build:
@(cd src; make build )
install_non_bb:
install:
@(cd src; make $@)
@(cd scripts; make $@)

View File

@ -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

View File

@ -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

View File

@ -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