From: David Lamparter <equinox@diac24.net>
Date: Sun, 28 Oct 2018 15:05:38 +0000 (+0100)
Subject: build: make rfptest and ospfclient "noinst"
X-Git-Tag: frr-7.1-dev~234^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=58596d3444b9abe9749776ab8c05a11d2f506f73;p=matthieu%2Ffrr.git

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 fa7c660116..9f6d33a855 100644
--- 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 d42c5b450e..c05d920d5f 100644
--- 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 1395af5dfb..671858aa02 100644
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -647,9 +647,6 @@ fi
 
 %files devel
 %{_libdir}/lib*.so
-%if %{with_ospfclient}
-    %{_sbindir}/ospfclient
-%endif
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*.h
 %dir %{_includedir}/%{name}/ospfd