diff options
| author | paul <paul> | 2004-09-13 07:00:18 +0200 |
|---|---|---|
| committer | paul <paul> | 2004-09-13 07:00:18 +0200 |
| commit | 0e82d0e1204e45ecce773a7e19f7d64140f7a66a (patch) | |
| tree | 9c1065e4ca14d42e8d68eba935189f42aab182a4 | |
| parent | autoreconf doesnt like top_srcdir var. update-autotools needs to -I m4 too (diff) | |
| download | frr-0e82d0e1204e45ecce773a7e19f7d64140f7a66a.tar.xz frr-0e82d0e1204e45ecce773a7e19f7d64140f7a66a.zip | |
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.
| -rw-r--r-- | vtysh/ChangeLog | 6 | ||||
| -rw-r--r-- | vtysh/Makefile.am | 2 | ||||
| -rwxr-xr-x | vtysh/extract.pl.in | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/vtysh/ChangeLog b/vtysh/ChangeLog index 0dbcb0d73..8e6684d21 100644 --- 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 45f99862d..c1c650bb7 100644 --- 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 6882b10b7..ae83a2e8d 100755 --- 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; } |