david.ward at ll
Apr 30, 2012, 8:36 AM
Views: 69
Permalink
|
|
[PATCH v2 2/6] doc: only package man pages for daemons that are built
|
|
Signed-off-by: David Ward <david.ward [at] ll>
---
configure.ac | 11 +++++++++++
doc/Makefile.am | 38 ++++++++++++++++++++++++++++++++++++--
2 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index cff896c..7e00e11 100755
--- a/configure.ac
+++ b/configure.ac
@@ -624,6 +624,7 @@ dnl [TODO] on Linux, and in [TODO] on Solaris.
* ) ;;
esac
AC_SUBST(LIBREADLINE)
+AM_CONDITIONAL(VTYSH, test "x$VTYSH" = "xvtysh")
dnl ----------
dnl PAM module
@@ -1228,36 +1229,42 @@ if test "${enable_zebra}" = "no";then
else
ZEBRA="zebra"
fi
+AM_CONDITIONAL(ZEBRA, test "x$ZEBRA" = "xzebra")
if test "${enable_bgpd}" = "no";then
BGPD=""
else
BGPD="bgpd"
fi
+AM_CONDITIONAL(BGPD, test "x$BGPD" = "xbgpd")
if test "${enable_ripd}" = "no";then
RIPD=""
else
RIPD="ripd"
fi
+AM_CONDITIONAL(RIPD, test "x$RIPD" = "xripd")
if test "${enable_ospfd}" = "no";then
OSPFD=""
else
OSPFD="ospfd"
fi
+AM_CONDITIONAL(OSPFD, test "x$OSPFD" = "xospfd")
if test "${enable_babeld}" = "no";then
BABELD=""
else
BABELD="babeld"
fi
+AM_CONDITIONAL(BABELD, test "x$BABELD" = "xbabeld")
if test "${enable_watchquagga}" = "no";then
WATCHQUAGGA=""
else
WATCHQUAGGA="watchquagga"
fi
+AM_CONDITIONAL(WATCHQUAGGA, test "x$WATCHQUAGGA" = "xwatchquagga")
OSPFCLIENT=""
if test "${enable_opaque_lsa}" != "no"; then
@@ -1270,24 +1277,28 @@ if test "${enable_opaque_lsa}" != "no"; then
fi
fi
+AM_CONDITIONAL(OSPFCLIENT, test "x$OSPFCLIENT" = "xospfclient")
case "${enable_ripngd}" in
"yes") RIPNGD="ripngd";;
"no" ) RIPNGD="";;
* ) ;;
esac
+AM_CONDITIONAL(RIPNGD, test "x$RIPNGD" = "xripngd")
case "${enable_ospf6d}" in
"yes") OSPF6D="ospf6d";;
"no" ) OSPF6D="";;
* ) ;;
esac
+AM_CONDITIONAL(OSPF6D, test "x$OSPF6D" = "xospf6d")
case "${enable_isisd}" in
"yes") ISISD="isisd";;
"no" ) ISISD="";;
* ) ;;
esac
+AM_CONDITIONAL(ISISD, test "x$ISISD" = "xisisd")
# XXX Perhaps auto-enable on Solaris, but that's messy for cross builds.
case "${enable_solaris}" in
diff --git a/doc/Makefile.am b/doc/Makefile.am
index dde95ab..4ba8f81 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -61,9 +61,43 @@ quagga_TEXINFOS = appendix.texi babeld.texi basic.texi bgpd.texi filter.texi \
.dia.png:
$(DIATOPNG) "$@" $<
-man_MANS = vtysh.1 bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8 isisd.8
+man_MANS =
-EXTRA_DIST = BGP-TypeCode draft-zebra-00.ms draft-zebra-00.txt $(man_MANS) \
+if BGPD
+man_MANS += bgpd.8
+endif
+
+if ISISD
+man_MANS += isisd.8
+endif
+
+if OSPF6D
+man_MANS += ospf6d.8
+endif
+
+if OSPFD
+man_MANS += ospfd.8
+endif
+
+if RIPD
+man_MANS += ripd.8
+endif
+
+if RIPNGD
+man_MANS += ripngd.8
+endif
+
+if VTYSH
+man_MANS += vtysh.1
+endif
+
+if ZEBRA
+man_MANS += zebra.8
+endif
+
+EXTRA_DIST = BGP-TypeCode draft-zebra-00.ms draft-zebra-00.txt \
+ bgpd.8 isisd.8 ospf6d.8 ospfd.8 ripd.8 \
+ ripngd.8 vtysh.1 zebra.8 \
mpls/ChangeLog.opaque.txt mpls/cli_summary.txt \
mpls/opaque_lsa.txt mpls/ospfd.conf \
$(figures_sources) $(figures_png) $(figures_txt)
--
1.7.1
_______________________________________________
Quagga-dev mailing list
Quagga-dev [at] lists
http://lists.quagga.net/mailman/listinfo/quagga-dev
|
[PATCH v2 2/6] doc: only package man pages for daemons that are built