From 1018422a57bc9b6dac0e0e3c57a9195fea889854 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Mon, 13 Jun 2016 19:10:17 -0400 Subject: [PATCH] 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 --- Makefile.am | 4 ++-- configure.ac | 2 ++ tools/Makefile.am | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 tools/Makefile.am diff --git a/Makefile.am b/Makefile.am index 4822cd5a7e..1a39844cb1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,11 +2,11 @@ SUBDIRS = lib @ZEBRA@ @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ \ @ISISD@ @PIMD@ @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 pimd + solaris pimd tools cumulus EXTRA_DIST = aclocal.m4 SERVICES TODO REPORTING-BUGS INSTALL.quagga.txt \ update-autotools \ diff --git a/configure.ac b/configure.ac index 4a9e6dbfb1..e7ca6015d2 100755 --- a/configure.ac +++ b/configure.ac @@ -1580,6 +1580,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 + -- 2.39.5