diff options
| author | gdt <gdt> | 2004-06-30 17:25:15 +0000 |
|---|---|---|
| committer | gdt <gdt> | 2004-06-30 17:25:15 +0000 |
| commit | f2bfdee5f9db5363fcd13763eca3fda729067d57 (patch) | |
| tree | dc9533e55d3edc3cab50cb0f11aad3968674a16e | |
| parent | fc9d074576c89299cb624b49810b52eda2da9b2c (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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 17 | ||||
| -rw-r--r-- | doc/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/Makefile.am | 4 |
4 files changed, 19 insertions, 13 deletions
@@ -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 3502e45a..c308e714 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 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 |