summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Langley <mightyjo@gmail.com>2021-06-04 00:37:59 -0400
committerJoseph Langley <mightyjo@gmail.com>2021-06-04 00:37:59 -0400
commit5fa412a3d95b3c2168dca1a4ad9139d273207756 (patch)
tree79b3ade791257314fc7adff85f6b99234c95e2d9
parent46299d7dbc53be696b59bc7846bc0d9634349876 (diff)
downloadflex-git-5fa412a3d95b3c2168dca1a4ad9139d273207756.tar.gz
fix(build): Set texi2* include paths for VPATH.
Override the TEXI2DVI and TEXI2PDF automake variables to add an include directory so VPATH builds work. I'm not thrilled with doing this. The right thing is probably to move the included examples to doc/ and do the VPATH magic in examples/manual/ where LaTeX is better able to deal with it.
-rwxr-xr-x[-rw-r--r--]doc/Makefile.am3
-rwxr-xr-x[-rw-r--r--]doc/flex.texi6
2 files changed, 6 insertions, 3 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4d15da7..ea44756 100644..100755
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,9 @@
FLEX = $(top_builddir)/src/flex$(EXEEXT)
+TEXI2DVI = @TEXI2DVI@ -I $(srcdir)/../examples/manual/
+TEXI2PDF = @TEXI2PDF@ -I $(srcdir)/../examples/manual/
info_TEXINFOS = flex.texi
+AM_MAKEINFOFLAGS = -I $(srcdir)/../examples/manual/
dist_man_MANS = flex.1
MAINTAINERCLEANFILES = flex.1
diff --git a/doc/flex.texi b/doc/flex.texi
index 30d98dd..28499f1 100644..100755
--- a/doc/flex.texi
+++ b/doc/flex.texi
@@ -354,7 +354,7 @@ Here's another simple example:
@cindex counting characters and lines; reentrant
@example
-@verbatiminclude ../examples/manual/example_r.lex
+@verbatiminclude example_r.lex
@end example
If you have looked at older versions of the Flex nanual, you might
@@ -362,7 +362,7 @@ have seen a version of the above example that looked more like this:
@cindex counting characters and lines; non-reentrant
@example
-@verbatiminclude ../examples/manual/example_nr.lex
+@verbatiminclude example_nr.lex
@end example
Both versions count the number of characters and the number of lines in
@@ -397,7 +397,7 @@ user-defined fields in the scanner structure which will be explained
in detail at @xref{Extra Data}. For now, consider this:
@example
-@verbatiminclude ../examples/manual/example_er.lex
+@verbatiminclude example_er.lex
@end example
While it requires a bit more ceremony, several instances of this