Use EXTRA_DIST to distribute files, and don't list directories.
Remove disthook that removed the crud that was copied in due to this.
diff --git a/ChangeLog b/ChangeLog
index ba53471..afdb9ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2004-06-30 Greg Troxel <gdt@poblano.ir.bbn.com>
+ * Makefile.am: add files to EXTRA_DIST rather than copying, and
+ omit the kludgy cleaning steps, which were failing when the list
+ to clean was empty.
+
+2004-06-30 Greg Troxel <gdt@poblano.ir.bbn.com>
+
* configure.ac: Look for perl, and substitute into vtysh/extract.pl.
Search for termcap functions more expansively (fixes vtysh compile
on NetBSD). Clean up --enable-vtysh definition.
diff --git a/Makefile.am b/Makefile.am
index 3502e45..c308e71 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,17 +3,10 @@
SUBDIRS = lib @ZEBRA@ @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ \
@ISISD@ @VTYSH@ @OSPFCLIENT@ redhat doc
-DIST_SUBDIRS = lib zebra bgpd ripd ripngd ospfd ospf6d vtysh \
- ospfclient doc redhat isisd
+DIST_SUBDIRS = lib zebra bgpd ripd ripngd ospfd ospf6d \
+ isisd vtysh ospfclient doc redhat
EXTRA_DIST = aclocal.m4 SERVICES TODO REPORTING-BUGS vtysh/Makefile.in \
- vtysh/Makefile.am update-autotools doc/mpls
-
-dist-hook:
- mkdir $(distdir)/tools
- cp -p $(srcdir)/tools/*.pl $(distdir)/tools
- cp -p $(srcdir)/tools/*.el $(distdir)/tools
- cp -p $(srcdir)/tools/*.cgi $(distdir)/tools
- rm -rf `find $(distdir)/doc -type d -name CVS`
- rm -rf `find $(distdir)/ -type f -name "*~"`
-
+ vtysh/Makefile.am update-autotools
+ tools/mrlg.cgi tools/rrcheck.pl tools/rrlookup.pl tools/zc.pl \
+ tools/zebra.el
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 188bc4f..37304ad 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 79fc122..1619453 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -8,7 +8,9 @@
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