From: Elan Ruusamäe <glen@delfi.ee>
Date: Thu, 21 Apr 2016 18:52:09 +0000 (+0300)
Subject: use make to install examples and contrib
X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffirehol.git;a=commitdiff_plain;h=9222a7d9d1038f293fd32e71830ea4e9e745b070

use make to install examples and contrib
---

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*