summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpaul <paul>2004-10-07 16:23:36 +0000
committerpaul <paul>2004-10-07 16:23:36 +0000
commit04b95ff4542816c54df0473769a6fb9bcc4dae76 (patch)
tree8cf7294fc452d096c3b73e6139d18681039f6c55
parent9457ee183e3578c9724cb738e8b04dc6f629a10f (diff)
downloadquagga-04b95ff4542816c54df0473769a6fb9bcc4dae76.tar.bz2
quagga-04b95ff4542816c54df0473769a6fb9bcc4dae76.tar.xz
- make specfile actually work
-rw-r--r--redhat/quagga.spec.in10
1 files changed, 6 insertions, 4 deletions
diff --git a/redhat/quagga.spec.in b/redhat/quagga.spec.in
index 24e3cb07..28443088 100644
--- a/redhat/quagga.spec.in
+++ b/redhat/quagga.spec.in
@@ -34,10 +34,12 @@
%define quagga_gid 92
%define daemon_list zebra ripd ospfd bgpd
%if %{with_ipv6}
-%define daemon_list %{daemon_list} ripngd ospf6d
+%define daemonv6_list %{daemon_list} ripngd ospf6d
%endif
%if %{with_isisd}
-%define daemon_list %{daemon_list} isisd
+%define daemon_other isisd
+%else
+%define daemon_other ""
%endif
# allow build dir to be kept
@@ -146,7 +148,7 @@ developing OSPF-API and quagga applications.
%if %{with_isisd}
--enable-isisd \
%else
- --disable-isisd
+ --disable-isisd \
%endif
%if %{with_pam}
--with-libpam \
@@ -179,7 +181,7 @@ make install \
rm -rf $RPM_BUILD_ROOT/usr/share/info/dir
# install etc sources
-for daemon in %daemon_list ; do
+for daemon in %{daemon_list} %{daemonv6_list} %{daemon_other} ; do
install %{zeb_rh_src}/${daemon}.init \
$RPM_BUILD_ROOT/etc/rc.d/init.d/${daemon}
done