diff options
| author | Vincent Bernat <bernat@luffy.cx> | 2012-05-22 14:32:22 +0200 |
|---|---|---|
| committer | Vincent Bernat <bernat@luffy.cx> | 2012-06-25 19:03:23 +0200 |
| commit | 9e7a548ce421660b0d22bfeb90c2b2b53742aac7 (patch) | |
| tree | 4c962403808f98806781fb4ad15594152bc1effa /vtysh | |
| parent | isisd: fix typo in topology generator (BZ#731) (diff) | |
| download | frr-9e7a548ce421660b0d22bfeb90c2b2b53742aac7.tar.xz frr-9e7a548ce421660b0d22bfeb90c2b2b53742aac7.zip | |
build: allow configure and build in a separate directory
Some .h files in lib/ are autogenerated. The search path should
include the build directory and the source directory. They usually
match but sometimes, they may be different. For example:
$ mkdir build
$ cd build
$ ../configure
$ make
Diffstat (limited to 'vtysh')
| -rw-r--r-- | vtysh/Makefile.am | 2 | ||||
| -rwxr-xr-x | vtysh/extract.pl.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vtysh/Makefile.am b/vtysh/Makefile.am index 0fd2f1487..7550173c5 100644 --- a/vtysh/Makefile.am +++ b/vtysh/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with Automake to create Makefile.in -INCLUDES = @INCLUDES@ -I$(top_srcdir) -I$(top_srcdir)/lib +INCLUDES = @INCLUDES@ -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" LIBS = @LIBS@ @CURSES@ @LIBPAM@ diff --git a/vtysh/extract.pl.in b/vtysh/extract.pl.in index 61b2d2a21..99224f80f 100755 --- a/vtysh/extract.pl.in +++ b/vtysh/extract.pl.in @@ -63,7 +63,7 @@ $ignore{'"show history"'} = "ignore"; foreach (@ARGV) { $file = $_; - open (FH, "cpp -DHAVE_CONFIG_H -DVTYSH_EXTRACT_PL -DHAVE_IPV6 -I@top_builddir@ -I@srcdir@/ -I@srcdir@/.. -I@top_srcdir@/lib -I@top_srcdir@/isisd/topology @SNMP_INCLUDES@ @CPPFLAGS@ $file |"); + open (FH, "cpp -DHAVE_CONFIG_H -DVTYSH_EXTRACT_PL -DHAVE_IPV6 -I@top_builddir@ -I@srcdir@/ -I@srcdir@/.. -I@top_srcdir@/lib -I@top_builddir@/lib -I@top_srcdir@/isisd/topology @SNMP_INCLUDES@ @CPPFLAGS@ $file |"); local $/; undef $/; $line = <FH>; close (FH); |