2003-06-04 Paul Jakma <paul@dishone.st>

	* (Makefile.am): doc should be a SUBDIR. Specify DIST_SUBDIRS to
	remove dependence of make dist on configure options. Add doc/mpls
	to EXTRA_DIST. redhat/ does not need a dist-hook, its already in
	SUBDIR. Remove CVS/ dir from the dist doc/.

diff --git a/Makefile.am b/Makefile.am
index b9b43552859410d63aac720e79ad922695643a83..6d9d864cec871230fc9a9269aa88ae201184df6e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,19 @@
 ## Process this file with automake to produce Makefile.in.
 
-SUBDIRS = lib @ZEBRA@ @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ @VTYSH@ @OSPFCLIENT@ doc
+SUBDIRS = lib @ZEBRA@ @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ \
+         @VTYSH@ @OSPFCLIENT@ doc
+
+DIST_SUBDIRS = lib zebra bgpd ripd ripngd ospfd ospf6d vtysh \
+              ospfclient doc
 
 EXTRA_DIST = aclocal.m4 SERVICES TODO REPORTING-BUGS vtysh/Makefile.in \
-       vtysh/Makefile.am update-autotools
+       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
-       mkdir $(distdir)/redhat
        cp -p $(srcdir)/redhat/*.init $(distdir)/redhat
        cp -p $(srcdir)/redhat/zebra.* $(distdir)/redhat
+       rm -rf `find $(distdir)/doc -type d -name CVS`