Browse Source

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

Zuul 2 months ago
parent
commit
4851c8658a

+ 1
- 1
service-mgmt/sm-1.0.0/Makefile View File

@@ -6,7 +6,7 @@
6 6
 build:
7 7
 	@(cd src; make build )
8 8
 
9
-install_non_bb:
9
+install:
10 10
 	@(cd src; make $@)
11 11
 	@(cd scripts; make $@)
12 12
 

+ 2
- 18
service-mgmt/sm-1.0.0/centos/sm.spec View File

@@ -59,10 +59,10 @@ MAJOR=`echo $VER | awk -F . '{print $1}'`
59 59
 make -j"%(nproc)"
60 60
 
61 61
 %install
62
-rm -rf $RPM_BUILD_ROOT
62
+rm -rf %{buildroot}
63 63
 VER=%{version}
64 64
 MAJOR=`echo $VER | awk -F . '{print $1}'`
65
-make DEST_DIR=$RPM_BUILD_ROOT UNIT_DIR=%{_unitdir} install_non_bb
65
+make DEST_DIR=%{buildroot} UNIT_DIR=%{_unitdir} install
66 66
 
67 67
 %post
68 68
 /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
81 81
 "/etc/init.d/sm-shutdown"
82 82
 "/etc/pmon.d/sm.conf"
83 83
 "/etc/logrotate.d/sm.logrotate"
84
-
85
-#%files -n sm-dbg
86
-#%defattr(-,-,-,-)
87
-#%dir "/usr"
88
-#%dir "/usr/bin"
89
-#%dir "/usr/src"
90
-#%dir "/usr/bin/.debug"
91
-#"/usr/bin/.debug/sm"
92
-#%dir "/usr/src/debug"
93
-#%dir "/usr/src/debug/sm"
94
-#%dir "/usr/src/debug/sm/1.0.0-r10"
95
-#%dir "/usr/src/debug/sm/1.0.0-r10/src"
96
-#/usr/src/debug/sm/1.0.0-r10/src/*.c
97
-#/usr/src/debug/sm/1.0.0-r10/src/*.h
98
-
99
-

+ 1
- 1
service-mgmt/sm-1.0.0/scripts/Makefile View File

@@ -1,4 +1,4 @@
1
-install_non_bb:
1
+install:
2 2
 	install -d ${DEST_DIR}/etc/init.d
3 3
 	install sm ${DEST_DIR}/etc/init.d/sm
4 4
 	install sm.shutdown ${DEST_DIR}/etc/init.d/sm-shutdown

+ 1
- 1
service-mgmt/sm-1.0.0/src/Makefile View File

@@ -130,7 +130,7 @@ LDFLAGS = -rdynamic
130 130
 build: $(OBJS)
131 131
 	$(CXX) $(CCFLAGS) $(EXTRACCFLAGS) $(OBJS) ${LDFLAGS} $(LDLIBS) -o sm
132 132
 
133
-install_non_bb:
133
+install:
134 134
 	install -d 755 ${DEST_DIR}/usr/bin
135 135
 	install -m 755 sm ${DEST_DIR}/usr/bin/sm
136 136
 

Loading…
Cancel
Save