[packages/openrc] simplify install

glen glen at pld-linux.org
Mon Feb 15 21:15:49 CET 2016


commit 8a1cab6c8cd268ae5ee6d5d229aa01c3172466d7
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Feb 15 22:15:44 2016 +0200

    simplify install

 openrc.spec | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/openrc.spec b/openrc.spec
index e41b0f1..660ffbc 100644
--- a/openrc.spec
+++ b/openrc.spec
@@ -49,22 +49,23 @@ EOF
 
 %build
 %{__make} \
-	CC="%{__cc}"
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags}" \
+	LDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
+%if %{with openrc}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
-
-%if %{without openrc}
-%{__rm} -r $RPM_BUILD_ROOT%{_sysconfdir}
-%{__rm} -r $RPM_BUILD_ROOT/lib
-%{__rm} -r $RPM_BUILD_ROOT/libexec
-%{__rm} -r $RPM_BUILD_ROOT/sbin
-%{__rm} -r $RPM_BUILD_ROOT%{_includedir}
-%{__rm} -r $RPM_BUILD_ROOT%{_prefix}/lib
-%{__rm} -r $RPM_BUILD_ROOT%{_prefix}/libexec
-%{__rm} -r $RPM_BUILD_ROOT%{_bindir}/rc-status
+%else
+# manually install only start-stop-daemon
+install -d $RPM_BUILD_ROOT/sbin
+install -p src/rc/start-stop-daemon $RPM_BUILD_ROOT/sbin
+%{__make} -C man install \
+	MAN3= \
+	MAN8=start-stop-daemon.8 \
+	DESTDIR=$RPM_BUILD_ROOT
 %endif
 
 %clean
@@ -95,4 +96,4 @@ rm -rf $RPM_BUILD_ROOT
 %files start-stop-daemon
 %defattr(644,root,root,755)
 %{_mandir}/man8/start-stop-daemon.8*
-%attr(755,root,root) %{_sbindir}/start-stop-daemon
+%attr(755,root,root) /sbin/start-stop-daemon
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openrc.git/commitdiff/8a1cab6c8cd268ae5ee6d5d229aa01c3172466d7



More information about the pld-cvs-commit mailing list