2003-12-30 Paul Jakma <paul@dishone.st>

        * Makefile.am: put the redhat/ stuff into EXTRA_DIST rather than
          copying via dist-hook. Remove ~ files backup cruft from dists.
          isisd/Makefile.am: sysconf example should go via
          dist_examples_DATA. The include-netbsd/ headers werent mentioned
          as sources and werent being copied into dists.

diff --git a/ChangeLog b/ChangeLog
index e385a85b34e71d23a5dc26c49a02d14fcac920c3..fc376275d137fdc88048475c59b571f8d26daf9e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-12-30 Paul Jakma <paul@dishone.st>
+
+       * Makefile.am: put the redhat/ stuff into EXTRA_DIST rather than
+         copying via dist-hook. Remove ~ files backup cruft from dists.
+         isisd/Makefile.am: sysconf example should go via
+         dist_examples_DATA. The include-netbsd/ headers werent mentioned
+         as sources and werent being copied into dists.
+         
 2003-12-23 Vincent Jardin <jardin@6wind.com>
 
        * isisd: Import isisd from Sampo Saaristo's source code.

diff --git a/Makefile.am b/Makefile.am
index 46cabb259276bdd4ca245e4fdec5e7b800ace921..6af673cca709bf77583fbe86acdd25bcf3467b5a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,13 +8,14 @@ DIST_SUBDIRS = lib zebra bgpd ripd ripngd ospfd ospf6d vtysh \
               isisd
 
 EXTRA_DIST = aclocal.m4 SERVICES TODO REPORTING-BUGS vtysh/Makefile.in \
-       vtysh/Makefile.am update-autotools doc/mpls
+       vtysh/Makefile.am update-autotools doc/mpls \
+       redhat/quagga.* redhat/*.init
 
 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
-       cp -p $(srcdir)/redhat/*.init $(distdir)/redhat
-       cp -p $(srcdir)/redhat/quagga.* $(distdir)/redhat
        rm -rf `find $(distdir)/doc -type d -name CVS`
+       rm -rf `find $(distdir)/ -type f -name "*~"`
+

diff --git a/isisd/Makefile.am b/isisd/Makefile.am
index fd4c199d648ffa8e120b1e8c298e831c5fa7cb8f..7088b2eaf0ec938cb3257ea70c247ff83c29c368 100644 (file)
--- a/isisd/Makefile.am
+++ b/isisd/Makefile.am
@@ -19,27 +19,13 @@ noinst_HEADERS = \
        isisd.h isis_pdu.h isis_tlv.h isis_adjacency.h isis_constants.h \
        isis_lsp.h dict.h isis_circuit.h isis_misc.h isis_network.h \
        isis_zebra.h isis_dr.h isis_flags.h isis_dynhn.h isis_common.h \
-       iso_checksum.h isis_csm.h isis_events.h isis_spf.h isis_route.h
+       iso_checksum.h isis_csm.h isis_events.h isis_spf.h isis_route.h \
+       include-netbsd/clnp.h include-netbsd/esis.h include-netbsd/iso.h
 
 isisd_SOURCES = \
        isis_main.c $(libisis_a_SOURCES)
 
-isisd_LDADD = ../lib/libzebra.a 
-
-sysconf_DATA = isisd.conf.sample
-
-EXTRA_DIST = $(sysconf_DATA)
-
-install-sysconfDATA: $(sysconf_DATA)
-       @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-       @list='$(sysconf_DATA)'; for p in $$list; do \
-         if test -f $(srcdir)/$$p; then \
-           echo " $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \
-           $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \
-         else if test -f $$p; then \
-           echo " $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdir)/$$p"; \
-           $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \
-         fi; fi; \
-       done
+isisd_LDADD = ../lib/libzebra.a @LIBCAP@
 
+examplesdir = $(exampledir)
+dist_examples_DATA = isisd.conf.sample