commit 9222a7d9d1038f293fd32e71830ea4e9e745b070
Author: Elan Ruusamäe <[email protected]>
Date: Thu Apr 21 21:52:09 2016 +0300
use make to install examples and contrib
firehol.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/firehol.spec b/firehol.spec
index 2d7d2a8..9f2fb2c 100644
--- a/firehol.spec
+++ b/firehol.spec
@@ -139,12 +139,10 @@ interfaces.
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
+ contribdir=%{_examplesdir}/%{name}-%{version}/contrib \
+ examplesdir=%{_examplesdir}/%{name}-%{version} \
DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-find $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} -name "Makefile*"
-delete -print
-
# Install systemd units.
install -d $RPM_BUILD_ROOT%{systemdunitdir}
cp -p %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{systemdunitdir}
@@ -196,6 +194,8 @@ fi
%dir %{_libdir}/firehol
%{_libdir}/firehol/functions.common.sh
%{_datadir}/update-ipsets
+%{_mandir}/man1/firehol.1*
+%{_mandir}/man1/fireqos.1*
%{_mandir}/man1/vnetbuild.1*
%{_mandir}/man5/firehol*.5*
%{_mandir}/man5/fireqos*.5*
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/firehol.git/commitdiff/48d6c301736f4e747d973caf8364c9b2fd019290
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
