2004-09-13 Paul Jakma <paul@dishone.st>

        * Makefile.am: extract.pl isnt in srcdir, it's always in the
          builddir.
        * extract.pl.in: match on end of filenames, filename could contain
          various preamble due to out of tree builds.

diff --git a/vtysh/ChangeLog b/vtysh/ChangeLog
index 0dbcb0d73a723d7c598ecdf2285a43e407cf6b6b..8e6684d2146fc652dec1db94212b55302b906e7b 100644 (file)
--- a/vtysh/ChangeLog
+++ b/vtysh/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-13 Paul Jakma <paul@dishone.st>
+
+       * Makefile.am: extract.pl isnt in srcdir, it's always in the builddir.
+       * extract.pl.in: match on end of filenames, filename could contain
+          various preamble due to out of tree builds.
+
 2004-08-28 Hasso Tepper <hasso at quagga.net>
 
        * vtysh_main.c: Rename signal handling functions not to conflict

diff --git a/vtysh/Makefile.am b/vtysh/Makefile.am
index 45f99862dcf957bff5bd189eed6c10402c91e20a..c1c650bb72e83c8488179167e682198e39a33c66 100644 (file)
--- a/vtysh/Makefile.am
+++ b/vtysh/Makefile.am
@@ -27,7 +27,7 @@ vtysh_cmd.c: $(top_srcdir)/ripd/*.c $(top_srcdir)/ripngd/*.c $(top_srcdir)/ospfd
   $(top_srcdir)/zebra/debug.c $(top_srcdir)/zebra/interface.c \
   $(top_srcdir)/zebra/irdp_interface.c $(top_srcdir)/zebra/rtadv.c $(top_srcdir)/zebra/zebra_vty.c \
   $(top_srcdir)/zebra/zserv.c
-       $(srcdir)/extract.pl $(top_srcdir)/ripd/*.c $(top_srcdir)/ripngd/*.c $(top_srcdir)/ospfd/*.c $(top_srcdir)/ospf6d/*.c \
+       ./extract.pl $(top_srcdir)/ripd/*.c $(top_srcdir)/ripngd/*.c $(top_srcdir)/ospfd/*.c $(top_srcdir)/ospf6d/*.c \
          $(top_srcdir)/isisd/*.c $(top_srcdir)/bgpd/*.c $(top_srcdir)/lib/keychain.c $(top_srcdir)/lib/routemap.c \
          $(top_srcdir)/lib/filter.c $(top_srcdir)/lib/plist.c $(top_srcdir)/lib/distribute.c $(top_srcdir)/lib/if_rmap.c \
          $(top_srcdir)/zebra/debug.c $(top_srcdir)/zebra/interface.c $(top_srcdir)/zebra/irdp.c \

diff --git a/vtysh/extract.pl.in b/vtysh/extract.pl.in
index 6882b10b782b5856b76560e2f3f50e8a38016e3d..ae83a2e8d3999b56957c94c74077737165141e46 100755 (executable)
--- a/vtysh/extract.pl.in
+++ b/vtysh/extract.pl.in
@@ -117,7 +117,7 @@ foreach (@ARGV) {
               }
            }
         } else {
-           ($protocol) = ($file =~ /\/([a-z0-9]+)/);
+           ($protocol) = ($file =~ /^.*\/([a-z0-9]+)\/[a-zA-Z0-9_\-]+\.c$/);
            $protocol = "VTYSH_" . uc $protocol;
         }