build: make rfptest and ospfclient "noinst"

Both of these are testing/demo-style tools that don't make sense as part
of a normal installation.  So don't install them.

NB: this is only the executables, libospfclient and the RFP code are not
affected.

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --git a/bgpd/rfp-example/rfptest/subdir.am b/bgpd/rfp-example/rfptest/subdir.am
index fa7c66011641e25b0b819b1b64bb71ae0fdc6570..9f6d33a855d8a52410479e280f5dfc69352daec3 100644 (file)
--- a/bgpd/rfp-example/rfptest/subdir.am
+++ b/bgpd/rfp-example/rfptest/subdir.am
@@ -3,7 +3,7 @@
 #
 
 if ENABLE_BGP_VNC
-sbin_PROGRAMS += bgpd/rfp-example/rfptest/rfptest
+noinst_PROGRAMS += bgpd/rfp-example/rfptest/rfptest
 endif
 
 bgpd_rfp_example_rfptest_rfptest_CFLAGS = -I$(top_srcdir)/bgpd/rfapi

diff --git a/ospfclient/subdir.am b/ospfclient/subdir.am
index df7d85a1f5d810ed637f425fa9d9bee6f0494f32..85950552e2286066715ac24da984defcba01534c 100644 (file)
--- a/ospfclient/subdir.am
+++ b/ospfclient/subdir.am
@@ -4,7 +4,7 @@
 
 if OSPFCLIENT
 lib_LTLIBRARIES += ospfclient/libfrrospfapiclient.la
-sbin_PROGRAMS += ospfclient/ospfclient
+noinst_PROGRAMS += ospfclient/ospfclient
 man8 += $(MANBUILD)/ospfclient.8
 endif
 

diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
index c15ca3e76a03e12c4b9e61549454f85c3490be87..04e0d06c6eeaab97db6504228d2cc46d598ae6f6 100644 (file)
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -645,9 +645,6 @@ fi
 
 %files devel
 %{_libdir}/lib*.so
-%if %{with_ospfclient}
-    %{_sbindir}/ospfclient
-%endif
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*.h
 %dir %{_includedir}/%{name}/ospfd