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 7e01a22d1a91129e0b4dd7a75b59fadadab93f70..4f3835b0ff4218da011511e5102aaaddab9da68f 100644 (file)
--- 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 78d3cda2684c140e484558bcbc690e3a4347073f..113c1619f817ddb9585ee50e8a2d51d1f20d4855 100755 (executable)
--- 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 (file)
index 0000000..125bfee
--- /dev/null
+++ b/tools/Makefile.am
@@ -0,0 +1,4 @@
+sbin_SCRIPTS = quagga-reload.py quagga
+
+EXTRA_DIST = quagga.service quagga-reload.py quagga
+