From 26e251b60395cf60fd81e6e10ab2c487f75f0164 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 21 Apr 2009 20:13:08 +0000 Subject: [PATCH] gdb: * configure.ac (--with-datarootdir, --with-docdir, --with-pdfdir, --with-htmldir): New. * configure: Regenerate. gdb/doc: * configure.ac (--with-datarootdir, --with-docdir, --with-pdfdir, --with-htmldir): New. * configure: Regenerate. * Makefile.in (datarootdir, docdir): Define. (gdb.dvi, gdb.pdf): Use same -I options as for building gdb.info instead of $(SET_TEXINPUTS). (gdbint.dvi, gdbint.pdf): Use same -I options as for building gdbint.info instead of $(SET_TEXINPUTS). (gdbint/index.html): Use same -I options as for building gdbint.info. (stabs.dvi, stabs.pdf): Use same -I options as for building stabs.info instead of $(SET_TEXINPUTS). (stabs/index.html): Use same -I options as for building stabs.info. (annotate.dvi, annotate.pdf): Use same -I options as for building annotate.info instead of $(SET_TEXINPUTS). (annotate/index.html): Use same -I options as for building annotate.info. --- gdb/ChangeLog | 6 ++++++ gdb/configure | 41 +++++++++++++++++++++++++++++++++++++++++ gdb/configure.ac | 22 +++++++++++++++++++++- gdb/doc/ChangeLog | 21 +++++++++++++++++++++ gdb/doc/Makefile.in | 26 +++++++++++++++----------- gdb/doc/configure | 43 +++++++++++++++++++++++++++++++++++++++++++ gdb/doc/configure.ac | 24 +++++++++++++++++++++++- 7 files changed, 170 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 218cb7281ed..5a5b757ce0d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2009-04-21 Joseph Myers + + * configure.ac (--with-datarootdir, --with-docdir, --with-pdfdir, + --with-htmldir): New. + * configure: Regenerate. + 2009-04-21 Tom Tromey * configure: Rebuild. diff --git a/gdb/configure b/gdb/configure index 555944b3fae..20bfdca2537 100755 --- a/gdb/configure +++ b/gdb/configure @@ -913,6 +913,10 @@ Optional Packages: --with-tcl directory containing tcl configuration (tclConfig.sh) --with-tk directory containing tk configuration (tkConfig.sh) --with-x use the X Window System + --with-datarootdir use datarootdir as the data root directory. + --with-docdir install documentation in this directory. + --with-pdfdir install pdf in this directory. + --with-htmldir install html in this directory. Some influential environment variables: CC C compiler command @@ -21207,6 +21211,43 @@ cat >>confdefs.h <<\_ACEOF _ACEOF +# Flags needed to enable html installing and building + +# Check whether --with-datarootdir or --without-datarootdir was given. +if test "${with_datarootdir+set}" = set; then + withval="$with_datarootdir" + datarootdir="\${prefix}/${withval}" +else + datarootdir="\${prefix}/share" +fi; + + +# Check whether --with-docdir or --without-docdir was given. +if test "${with_docdir+set}" = set; then + withval="$with_docdir" + docdir="\${prefix}/${withval}" +else + docdir="\${datarootdir}/doc" +fi; + + +# Check whether --with-pdfdir or --without-pdfdir was given. +if test "${with_pdfdir+set}" = set; then + withval="$with_pdfdir" + pdfdir="\${prefix}/${withval}" +else + pdfdir="\${docdir}" +fi; + + +# Check whether --with-htmldir or --without-htmldir was given. +if test "${with_htmldir+set}" = set; then + withval="$with_htmldir" + htmldir="\${prefix}/${withval}" +else + htmldir="\${docdir}" +fi; + diff --git a/gdb/configure.ac b/gdb/configure.ac index ff83563b9f0..e52b77c1b25 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1960,7 +1960,27 @@ dnl At the moment, we just assume it's UTF-8. AC_DEFINE(GDB_DEFAULT_HOST_CHARSET, "UTF-8", [Define to be a string naming the default host character set.]) -dnl Required by html, pdf, install-pdf and install-html +# Flags needed to enable html installing and building +AC_ARG_WITH(datarootdir, +AC_HELP_STRING([--with-datarootdir], [use datarootdir as the data root directory.]), +[datarootdir="\${prefix}/${withval}"], +[datarootdir="\${prefix}/share"]) + +AC_ARG_WITH(docdir, +AC_HELP_STRING([--with-docdir], [install documentation in this directory.]), +[docdir="\${prefix}/${withval}"], +[docdir="\${datarootdir}/doc"]) + +AC_ARG_WITH(pdfdir, +AC_HELP_STRING([--with-pdfdir], [install pdf in this directory.]), +[pdfdir="\${prefix}/${withval}"], +[pdfdir="\${docdir}"]) + +AC_ARG_WITH(htmldir, +AC_HELP_STRING([--with-htmldir], [install html in this directory.]), +[htmldir="\${prefix}/${withval}"], +[htmldir="\${docdir}"]) + AC_SUBST(datarootdir) AC_SUBST(docdir) AC_SUBST(htmldir) diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 525f1e49548..1bbc48c1608 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,24 @@ +2009-04-21 Joseph Myers + + * configure.ac (--with-datarootdir, --with-docdir, --with-pdfdir, + --with-htmldir): New. + * configure: Regenerate. + * Makefile.in (datarootdir, docdir): Define. + (gdb.dvi, gdb.pdf): Use same -I options as for building gdb.info + instead of $(SET_TEXINPUTS). + (gdbint.dvi, gdbint.pdf): Use same -I options as for building + gdbint.info instead of $(SET_TEXINPUTS). + (gdbint/index.html): Use same -I options as for building + gdbint.info. + (stabs.dvi, stabs.pdf): Use same -I options as for building + stabs.info instead of $(SET_TEXINPUTS). + (stabs/index.html): Use same -I options as for building + stabs.info. + (annotate.dvi, annotate.pdf): Use same -I options as for building + annotate.info instead of $(SET_TEXINPUTS). + (annotate/index.html): Use same -I options as for building + annotate.info. + 2009-04-21 David Daney * gdb.texinfo (maint show-debug-regs): Remove mention of x86. diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in index 34ee07c6832..b7f9af0ba8a 100644 --- a/gdb/doc/Makefile.in +++ b/gdb/doc/Makefile.in @@ -24,6 +24,8 @@ VPATH = @srcdir@ prefix = @prefix@ infodir = @infodir@ +datarootdir = @datarootdir@ +docdir = @docdir@ pdfdir = @pdfdir@ htmldir = @htmldir@ @@ -338,7 +340,8 @@ gdb.dvi: ${GDB_DOC_FILES} ln $(srcdir)/GDBvn.texi . || \ cp $(srcdir)/GDBvn.texi . ; else true; fi rm -f $(GDB_TEX_TMPS) - $(SET_TEXINPUTS) $(TEXI2DVI) $(srcdir)/gdb.texinfo + $(TEXI2DVI) -I ${READLINE_DIR} -I ${GDBMI_DIR} -I $(srcdir) \ + $(srcdir)/gdb.texinfo gdb.ps: gdb.dvi $(DVIPS) -o $@ $? @@ -349,7 +352,8 @@ gdb.pdf: ${GDB_DOC_FILES} ln $(srcdir)/GDBvn.texi . || \ cp $(srcdir)/GDBvn.texi . ; else true; fi rm -f $(GDB_TEX_TMPS) - $(SET_TEXINPUTS) $(TEXI2DVI) --pdf $(srcdir)/gdb.texinfo + $(TEXI2DVI) --pdf -I ${READLINE_DIR} -I ${GDBMI_DIR} -I $(srcdir) \ + $(srcdir)/gdb.texinfo # GDB MANUAL: info file gdb.info: ${GDB_DOC_FILES} @@ -440,14 +444,14 @@ GDBINT_TEX_TMPS = gdbint.aux gdbint.cp* gdbint.fn* gdbint.ky* \ # GDB INTERNALS MANUAL: TeX dvi file gdbint.dvi: $(GDBINT_DOC_FILES) rm -f $(GDBINT_TEX_TMPS) - $(SET_TEXINPUTS) $(TEXI2DVI) $(srcdir)/gdbint.texinfo + $(TEXI2DVI) -I $(srcdir) $(srcdir)/gdbint.texinfo gdbint.ps : gdbint.dvi $(DVIPS) -o $@ $? gdbint.pdf: $(GDBINT_DOC_FILES) rm -f $(GDBINT_TEX_TMPS) - $(SET_TEXINPUTS) $(TEXI2DVI) --pdf $(srcdir)/gdbint.texinfo + $(TEXI2DVI) --pdf -I $(srcdir) $(srcdir)/gdbint.texinfo # GDB INTERNALS MANUAL: info file @@ -457,7 +461,7 @@ gdbint.info: $(GDBINT_DOC_FILES) # GDB INTERNALS MANUAL: HTML file gdbint/index.html: $(GDBINT_DOC_FILES) - $(MAKEHTML) $(MAKEHTMLFLAGS) $(srcdir)/gdbint.texinfo + $(MAKEHTML) $(MAKEHTMLFLAGS) -I $(srcdir) $(srcdir)/gdbint.texinfo stabs.info: $(STABS_DOC_FILES) $(MAKEINFO) -I $(srcdir) -o stabs.info $(srcdir)/stabs.texinfo @@ -465,7 +469,7 @@ stabs.info: $(STABS_DOC_FILES) # STABS DOCUMENTATION: HTML file stabs/index.html: $(STABS_DOC_FILES) - $(MAKEHTML) $(MAKEHTMLFLAGS) $(srcdir)/stabs.texinfo + $(MAKEHTML) $(MAKEHTMLFLAGS) -I $(srcdir) $(srcdir)/stabs.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 @@ -476,14 +480,14 @@ STABS_TEX_TMPS = stabs.aux stabs.cp* stabs.fn* stabs.ky* \ # STABS DOCUMENTATION: TeX dvi file stabs.dvi : $(STABS_DOC_FILES) rm -f $(STABS_TEX_TMPS) - $(SET_TEXINPUTS) $(TEXI2DVI) $(srcdir)/stabs.texinfo + $(TEXI2DVI) -I $(srcdir) $(srcdir)/stabs.texinfo stabs.ps: stabs.dvi $(DVIPS) -o $@ $? stabs.pdf: $(STABS_DOC_FILES) rm -f $(STABS_TEX_TMPS) - $(SET_TEXINPUTS) $(TEXI2DVI) --pdf $(srcdir)/stabs.texinfo + $(TEXI2DVI) --pdf -I $(srcdir) $(srcdir)/stabs.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 @@ -494,20 +498,20 @@ ANNOTATE_TEX_TMPS = annotate.aux annotate.cp* annotate.fn* annotate.ky* \ # ANNOTATE DOCUMENTATION: TeX dvi file annotate.dvi : $(ANNOTATE_DOC_FILES) rm -f $(ANNOTATE_TEX_TMPS) - $(SET_TEXINPUTS) $(TEXI2DVI) $(srcdir)/annotate.texinfo + $(TEXI2DVI) -I $(srcdir) $(srcdir)/annotate.texinfo annotate.ps: annotate.dvi $(DVIPS) -o $@ $? annotate.pdf: $(ANNOTATE_DOC_FILES) rm -f $(ANNOTATE_TEX_TMPS) - $(SET_TEXINPUTS) $(TEXI2DVI) --pdf $(srcdir)/annotate.texinfo + $(TEXI2DVI) --pdf -I $(srcdir) $(srcdir)/annotate.texinfo annotate.info: $(ANNOTATE_DOC_FILES) $(MAKEINFO) -I $(srcdir) -o annotate.info $(srcdir)/annotate.texinfo annotate/index.html: $(ANNOTATE_DOC_FILES) - $(MAKEHTML) $(MAKEHTMLFLAGS) $(srcdir)/annotate.texinfo + $(MAKEHTML) $(MAKEHTMLFLAGS) -I $(srcdir) $(srcdir)/annotate.texinfo force: diff --git a/gdb/doc/configure b/gdb/doc/configure index dd5c9b0e20a..fdaa1f6107d 100755 --- a/gdb/doc/configure +++ b/gdb/doc/configure @@ -783,6 +783,10 @@ if test -n "$ac_init_help"; then Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-datarootdir use datarootdir as the data root directory. + --with-docdir install documentation in this directory. + --with-pdfdir install pdf in this directory. + --with-htmldir install html in this directory. --with-pkgversion=PKG Use PKG in the version string in place of "GDB" --with-bugurl=URL Direct users to URL to report a bug @@ -1441,6 +1445,45 @@ echo "${ECHO_T}no, using $LN_S" >&6 fi +# Flags needed to enable html installing and building + +# Check whether --with-datarootdir or --without-datarootdir was given. +if test "${with_datarootdir+set}" = set; then + withval="$with_datarootdir" + datarootdir="\${prefix}/${withval}" +else + datarootdir="\${prefix}/share" +fi; + + +# Check whether --with-docdir or --without-docdir was given. +if test "${with_docdir+set}" = set; then + withval="$with_docdir" + docdir="\${prefix}/${withval}" +else + docdir="\${datarootdir}/doc" +fi; + + +# Check whether --with-pdfdir or --without-pdfdir was given. +if test "${with_pdfdir+set}" = set; then + withval="$with_pdfdir" + pdfdir="\${prefix}/${withval}" +else + pdfdir="\${docdir}" +fi; + + +# Check whether --with-htmldir or --without-htmldir was given. +if test "${with_htmldir+set}" = set; then + withval="$with_htmldir" + htmldir="\${prefix}/${withval}" +else + htmldir="\${docdir}" +fi; + + + diff --git a/gdb/doc/configure.ac b/gdb/doc/configure.ac index 80eb2b7ae94..b7a2b482b25 100644 --- a/gdb/doc/configure.ac +++ b/gdb/doc/configure.ac @@ -3,11 +3,33 @@ AC_INIT(refcard.tex) sinclude(../../config/acx.m4) AC_PROG_INSTALL AC_PROG_LN_S -dnl Required by html, pdf, install-pdf and install-html + +# Flags needed to enable html installing and building +AC_ARG_WITH(datarootdir, +AC_HELP_STRING([--with-datarootdir], [use datarootdir as the data root directory.]), +[datarootdir="\${prefix}/${withval}"], +[datarootdir="\${prefix}/share"]) + +AC_ARG_WITH(docdir, +AC_HELP_STRING([--with-docdir], [install documentation in this directory.]), +[docdir="\${prefix}/${withval}"], +[docdir="\${datarootdir}/doc"]) + +AC_ARG_WITH(pdfdir, +AC_HELP_STRING([--with-pdfdir], [install pdf in this directory.]), +[pdfdir="\${prefix}/${withval}"], +[pdfdir="\${docdir}"]) + +AC_ARG_WITH(htmldir, +AC_HELP_STRING([--with-htmldir], [install html in this directory.]), +[htmldir="\${prefix}/${withval}"], +[htmldir="\${docdir}"]) + AC_SUBST(datarootdir) AC_SUBST(docdir) AC_SUBST(htmldir) AC_SUBST(pdfdir) + ACX_PKGVERSION([GDB]) ACX_BUGURL([http://www.gnu.org/software/gdb/bugs/]) AC_OUTPUT(Makefile) -- 2.30.2