2004-08-31  Greg Troxel  <gdt@poblano.ir.bbn.com>

        * Makefile.am (EXTRA_DIST): New - just has EXTRA_DIST.  (Using a
        directory in EXTRA_DIST in the parent was causing 'make dist' to fail.)

(Now m4/Makefile* is first-class and included from top level.)
diff --git a/Makefile.am b/Makefile.am
index d620c99..dbc0807 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,14 @@
 ## Process this file with automake to produce Makefile.in.
 
 SUBDIRS = lib @ZEBRA@ @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ \
-         @ISISD@ @VTYSH@ @OSPFCLIENT@ @pkgsrcdir@ redhat doc
+         @ISISD@ @VTYSH@ @OSPFCLIENT@ doc m4 @pkgsrcdir@ redhat
 
 DIST_SUBDIRS = lib zebra bgpd ripd ripngd ospfd ospf6d \
-	  isisd vtysh ospfclient doc pkgsrc redhat tests
+	  isisd vtysh ospfclient doc m4 pkgsrc redhat tests
 
 EXTRA_DIST = aclocal.m4 SERVICES TODO REPORTING-BUGS vtysh/Makefile.in \
 	vtysh/Makefile.am update-autotools \
 	tools/mrlg.cgi tools/rrcheck.pl tools/rrlookup.pl tools/zc.pl \
-	tools/zebra.el m4
+	tools/zebra.el
 
 ACLOCAL_AMFLAGS = -I m4