From: Donald Sharp <sharpd@cumulusnetwroks.com>
Date: Mon, 13 Jun 2016 23:10:17 +0000 (-0400)
Subject: quagga: Modify code to build properly in tools and cumulus
X-Git-Tag: frr-2.0-rc1~465^2~9
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9d92810cf1516568b0b5cef6077c9603c7636bfb;p=mirror%2Ffrr.git

quagga: Modify code to build properly in tools and cumulus

The tools and cumulus directories were not properly
being included for the 'make dist' step to allow
for proper distribution of code.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

Conflicts:
	Makefile.am
---

diff --git a/Makefile.am b/Makefile.am
index 7e01a22d1a..4f3835b0ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,11 +2,11 @@
 
 SUBDIRS = lib @ZEBRA@ @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ \
          @ISISD@ @WATCHQUAGGA@ @VTYSH@ @OSPFCLIENT@ @DOC@ m4 @pkgsrcdir@ \
-         redhat @SOLARIS@ tests
+         redhat @SOLARIS@ tests tools cumulus
 
 DIST_SUBDIRS = lib zebra bgpd ripd ripngd ospfd ospf6d \
 	  isisd watchquagga vtysh ospfclient doc m4 pkgsrc redhat tests \
-	  solaris
+	  solaris tools cumulus
 
 EXTRA_DIST = aclocal.m4 SERVICES TODO REPORTING-BUGS INSTALL.quagga.txt \
 	update-autotools \
diff --git a/configure.ac b/configure.ac
index 78d3cda268..113c1619f8 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1750,6 +1750,8 @@ AC_CONFIG_FILES([Makefile lib/Makefile zebra/Makefile ripd/Makefile
 	  tests/bgpd.tests/Makefile
 	  tests/libzebra.tests/Makefile
 	  redhat/Makefile
+	  tools/Makefile
+	  cumulus/Makefile
 	  pkgsrc/Makefile
 	  redhat/quagga.spec 
 	  lib/version.h
diff --git a/tools/Makefile.am b/tools/Makefile.am
new file mode 100644
index 0000000000..125bfee2c2
--- /dev/null
+++ b/tools/Makefile.am
@@ -0,0 +1,4 @@
+sbin_SCRIPTS = quagga-reload.py quagga
+
+EXTRA_DIST = quagga.service quagga-reload.py quagga
+