diff options
| author | Tom Tromey <tromey@redhat.com> | 2010-11-23 14:39:16 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2010-11-23 14:39:16 +0000 |
| commit | 39037522c862528df367aaa40015fdf9641b8d19 (patch) | |
| tree | e38d7430c8e63632731bec1fec9685d3d013b2ce /gdb/doc/Makefile.in | |
| parent | 5ae98d2512a3d327aed9e66fc065e010e38379f9 (diff) | |
| download | gdb-39037522c862528df367aaa40015fdf9641b8d19.zip gdb-39037522c862528df367aaa40015fdf9641b8d19.tar.gz gdb-39037522c862528df367aaa40015fdf9641b8d19.tar.bz2 | |
gdb
* configure: Rebuild.
* configure.ac (READLINE_TEXI_INCFLAG): New subst.
gdb/doc
* gdb.texinfo (Top): Check SYSTEM_READLINE.
(Editing): Likewise.
(Command History): Likewise.
(TUI Keys): Likewise.
(Bug Reporting): Conditionally include rluser.texi and
inc-history.texinfo.
* Makefile.in (READLINE_TEXI_INCFLAG): New variable.
(GDB_DOC_SOURCE_INCLUDES): Add comment.
(GDBvn.texi): Set SYSTEM_READLINE when appropriate.
(gdb.dvi): Use READLINE_TEXI_INCFLAG.
(gdb.pdf): Likewise.
(gdb.info): Likewise.
(gdb/index.html): Likewise.
Diffstat (limited to 'gdb/doc/Makefile.in')
| -rw-r--r-- | gdb/doc/Makefile.in | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in index a572f90..615af63 100644 --- a/gdb/doc/Makefile.in +++ b/gdb/doc/Makefile.in @@ -63,6 +63,7 @@ BUGURL_TEXI = @REPORT_BUGS_TEXI@ # Where is the source dir for the READLINE library doc? # Traditionally readline is in .. or . READLINE_DIR = ${gdbdir}/../readline/doc +READLINE_TEXI_INCFLAG = @READLINE_TEXI_INCFLAG@ # The GDB/MI docs come from a sibling directory ../mi GDBMI_DIR = ${gdbdir}/mi @@ -108,6 +109,9 @@ PDFTEX = pdftex DVIPS = dvips # Main GDB manual +# Note that this unconditionally includes the readline texi files, +# even when --with-system-readline is used. This is harmless because +# these are only used as dependencies. GDB_DOC_SOURCE_INCLUDES = \ $(srcdir)/fdl.texi \ $(srcdir)/gpl.texi \ @@ -303,6 +307,9 @@ GDBvn.texi : ${gdbdir}/version.in if [ "$(BUGURL_TEXI)" = "@uref{http://www.gnu.org/software/gdb/bugs/}" ]; then \ echo "@set BUGURL_DEFAULT" >> ./GDBvn.new; \ fi + if test -z "$(READLINE_TEXI_INCFLAG)"; then \ + echo "@set SYSTEM_READLINE" >> ./GDBvn.new; \ + fi mv GDBvn.new GDBvn.texi # Updated atomically @@ -340,7 +347,7 @@ gdb.dvi: ${GDB_DOC_FILES} ln $(srcdir)/GDBvn.texi . || \ cp $(srcdir)/GDBvn.texi . ; else true; fi rm -f $(GDB_TEX_TMPS) - $(TEXI2DVI) -I ${READLINE_DIR} -I ${GDBMI_DIR} -I $(srcdir) \ + $(TEXI2DVI) $(READLINE_TEXI_INCFLAG) -I ${GDBMI_DIR} -I $(srcdir) \ $(srcdir)/gdb.texinfo gdb.ps: gdb.dvi @@ -352,12 +359,12 @@ gdb.pdf: ${GDB_DOC_FILES} ln $(srcdir)/GDBvn.texi . || \ cp $(srcdir)/GDBvn.texi . ; else true; fi rm -f $(GDB_TEX_TMPS) - $(TEXI2DVI) --pdf -I ${READLINE_DIR} -I ${GDBMI_DIR} -I $(srcdir) \ + $(TEXI2DVI) --pdf $(READLINE_TEXI_INCFLAG) -I ${GDBMI_DIR} -I $(srcdir) \ $(srcdir)/gdb.texinfo # GDB MANUAL: info file gdb.info: ${GDB_DOC_FILES} - $(MAKEINFO) -I ${READLINE_DIR} -I ${GDBMI_DIR} -I $(srcdir) \ + $(MAKEINFO) $(READLINE_TEXI_INCFLAG) -I ${GDBMI_DIR} -I $(srcdir) \ -o gdb.info $(srcdir)/gdb.texinfo # GDB MANUAL: roff translations @@ -433,7 +440,7 @@ gdb.mm: $(GDB_DOC_FILES) links2roff # GDB MANUAL: HTML file gdb/index.html: ${GDB_DOC_FILES} - $(MAKEHTML) $(MAKEHTMLFLAGS) -I ${READLINE_DIR} -I ${GDBMI_DIR} -I $(srcdir) $(srcdir)/gdb.texinfo + $(MAKEHTML) $(MAKEHTMLFLAGS) $(READLINE_TEXI_INCFLAG) -I ${GDBMI_DIR} -I $(srcdir) $(srcdir)/gdb.texinfo # Clean these up before each run. Avoids a catch 22 with not being # able to re-generate these files (to fix a corruption) because these |