This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
install-html and install-pdf improvements
- From: "Joseph S. Myers" <joseph at codesourcery dot com>
- To: gdb-patches at sourceware dot org
- Date: Fri, 17 Apr 2009 11:47:39 +0000 (UTC)
- Subject: install-html and install-pdf improvements
This patch improves "make install-html" and "make install-pdf" support
for GDB:
* There are toplevel configure options --with-htmldir and
--with-pdfdir to control where HTML and PDF manuals are installed.
This patch makes the gdb/ directory follow these rather than
hardcoding its own directory settings.
* The readline and sim directories need some dummy rules so that these
targets work at toplevel.
Note: with the version of texi2html I have installed "make
install-html" doesn't actually work either before or after the patch,
because gdb/doc/Makefile.in is expecting files such as gdb_toc.html to
be placed in the current directory and texi2html is placing them in a
gdb/ subdirectory. I have a separate patch to switch to using
makeinfo --html, which is more predictable in its output naming and is
the usual approach used by GNU software for building HTML manuals, but
that's logically independent of this patch.
OK to commit?
gdb:
2009-04-17 Carlos O'Donell <carlos@codesourcery.com>
* configure.ac: AC_SUBST datarootdir, docdir, htmldir, pdfdir.
* configure: Regenerate.
* Makefile.in: Set datarootdir, docdir, htmldir, and pdfdir from
configure substitutions.
(FLAGS_TO_PASS): Add datarootdir, docdir, and htmldir.
gdb/doc:
2009-04-17 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.in: Set pdfdir and htmldir from configure
substitutions.
* configure.ac: AC_SUBST datarootdir, docdir, htmldir, pdfdir.
* configure: Regenerate.
readline:
2009-04-17 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.in: Add html target. Add dummy install-html and
install-pdf targets.
sim:
2009-04-17 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.in: Add dummy install-pdf, html, and
install-html targets.
Index: gdb/Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.1076
diff -u -r1.1076 Makefile.in
--- gdb/Makefile.in 30 Mar 2009 19:54:19 -0000 1.1076
+++ gdb/Makefile.in 17 Apr 2009 11:28:54 -0000
@@ -40,8 +40,10 @@
man8dir = $(mandir)/man8
man9dir = $(mandir)/man9
infodir = @infodir@
-pdfdir = $(prefix)/share/doc/gdb
-htmldir = $(prefix)/html
+datarootdir = @datarootdir@
+docdir = @docdir@
+htmldir = @htmldir@
+pdfdir = @pdfdir@
includedir = @includedir@
# This can be referenced by `LIBINTL' as computed by
@@ -530,6 +532,9 @@
"prefix=$(prefix)" \
"exec_prefix=$(exec_prefix)" \
"infodir=$(infodir)" \
+ "datarootdir=$(datarootdir)" \
+ "docdir=$(docdir)" \
+ "htmldir=$(htmldir)" \
"pdfdir=$(pdfdir)" \
"libdir=$(libdir)" \
"mandir=$(mandir)" \
Index: gdb/configure.ac
===================================================================
RCS file: /cvs/src/src/gdb/configure.ac,v
retrieving revision 1.92
diff -u -r1.92 configure.ac
--- gdb/configure.ac 15 Apr 2009 22:20:31 -0000 1.92
+++ gdb/configure.ac 17 Apr 2009 11:28:55 -0000
@@ -1955,6 +1955,12 @@
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
+AC_SUBST(datarootdir)
+AC_SUBST(docdir)
+AC_SUBST(htmldir)
+AC_SUBST(pdfdir)
+
AC_OUTPUT(Makefile .gdbinit:gdbinit.in gnulib/Makefile,
[
dnl Autoconf doesn't provide a mechanism for modifying definitions
Index: gdb/doc/Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/doc/Makefile.in,v
retrieving revision 1.43
diff -u -r1.43 Makefile.in
--- gdb/doc/Makefile.in 3 Jan 2009 05:57:56 -0000 1.43
+++ gdb/doc/Makefile.in 17 Apr 2009 11:28:55 -0000
@@ -24,8 +24,8 @@
prefix = @prefix@
infodir = @infodir@
-pdfdir = $(prefix)/share/doc/gdb
-htmldir = $(prefix)/html
+pdfdir = @pdfdir@
+htmldir = @htmldir@
SHELL = @SHELL@
Index: gdb/doc/configure.ac
===================================================================
RCS file: /cvs/src/src/gdb/doc/configure.ac,v
retrieving revision 1.2
diff -u -r1.2 configure.ac
--- gdb/doc/configure.ac 5 Jun 2008 22:36:56 -0000 1.2
+++ gdb/doc/configure.ac 17 Apr 2009 11:28:55 -0000
@@ -3,6 +3,11 @@
sinclude(../../config/acx.m4)
AC_PROG_INSTALL
AC_PROG_LN_S
+dnl Required by html, pdf, install-pdf and install-html
+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)
Index: readline/Makefile.in
===================================================================
RCS file: /cvs/src/src/readline/Makefile.in,v
retrieving revision 1.9
diff -u -r1.9 Makefile.in
--- readline/Makefile.in 27 Mar 2007 18:09:35 -0000 1.9
+++ readline/Makefile.in 17 Apr 2009 11:28:56 -0000
@@ -297,10 +297,12 @@
$(RM) $(CREATED_CONFIGURE)
$(RM) $(CREATED_TAGS)
-info dvi pdf:
+info dvi html pdf:
-( cd doc && $(MAKE) $(MFLAGS) $@ )
install-info:
+install-html:
+install-pdf:
check:
installcheck:
Index: sim/Makefile.in
===================================================================
RCS file: /cvs/src/src/sim/Makefile.in,v
retrieving revision 1.16
diff -u -r1.16 Makefile.in
--- sim/Makefile.in 14 Jan 2009 10:53:05 -0000 1.16
+++ sim/Makefile.in 17 Apr 2009 11:28:56 -0000
@@ -187,6 +187,9 @@
install-info:
dvi:
pdf:
+install-pdf:
+html:
+install-html:
###
###
--
Joseph S. Myers
joseph@codesourcery.com