summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorgdt <gdt>2004-06-30 17:25:15 +0000
committergdt <gdt>2004-06-30 17:25:15 +0000
commitf2bfdee5f9db5363fcd13763eca3fda729067d57 (patch)
treedc9533e55d3edc3cab50cb0f11aad3968674a16e /doc
parentfc9d074576c89299cb624b49810b52eda2da9b2c (diff)
Use EXTRA_DIST to distribute files, and don't list directories.
Remove disthook that removed the crud that was copied in due to this.
Diffstat (limited to 'doc')
-rw-r--r--doc/ChangeLog5
-rw-r--r--doc/Makefile.am4
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 188bc4ff..37304ada 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-30 Greg Troxel <gdt@poblano.ir.bbn.com>
+
+ * Makefile.am (EXTRA_DIST): Add files in mpls explicitly, to avoid
+ copying CVS files, per the automake manual's recommendations.
+
2004-05-27 Paul Jakma <paul@dishone.st>
* Correct RIP port, s/521/520/, reported by xantius@xantius.com
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 79fc1220..16194533 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -8,7 +8,9 @@ quagga_TEXINFOS = appendix.texi basic.texi bgpd.texi filter.texi install.texi \
man_MANS = vtysh.1 bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8
-EXTRA_DIST = BGP-TypeCode draft-zebra-00.ms draft-zebra-00.txt $(man_MANS)
+EXTRA_DIST = BGP-TypeCode draft-zebra-00.ms draft-zebra-00.txt $(man_MANS) \
+ mpls/ChangeLog.opaque.txt mpls/cli_summary.txt \
+ mpls/opaque_lsa.txt mpls/ospfd.conf
draft-zebra-00.txt:
groff -T ascii -ms draft-zebra-00.ms > draft-zebra-00.txt