This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH] Add install-html support to binutils.
- From: Carlos O'Donell <carlos at codesourcery dot com>
- To: binutils at sourceware dot org
- Date: Wed, 22 Mar 2006 17:11:40 -0500
- Subject: [PATCH] Add install-html support to binutils.
The patch provides the following:
o "install-html" target for all SUBDIRS of binutils.
o --with-htmldir option to install html files in another location.
o --with-docdir option to override docdir.
o --with-datarootdir option to override datarootdir.
According to the GNU standard the following defaults apply:
datarootdir="${prefix}/share"
docdir="${datarootdir}/doc"
htmldir="${docdir}"
I have added datarootdir, docdir and htmldir from the toplevel down.
I verified that all .html files constructed by the "html" target are
installed to the correct location by "install-html."
The patch is a lot of cut-n-paste, with some directories
requiring special care:
etc/
libiberty/
These directories do not use automake, and require special rules.
The changes to libiberty will have to be posted to gcc-patches
for review by DJ.
The rest of the directories install targets are based on the
install-html rules generated by the cvs head versions of autoconf
and automake (which have support for install-html).
General comments:
- I paid careful attention to use the correct version of autoconf
and automake where appropriate. In some instances I used
autoconf-2.13 instead of the previous file generator autoconf-2.12
Everything tested okay in this respect.
- The toplevel Makefile.in has a lot of changes only because a new
recursive target has been added (install-html). This blooms into
a set of targets for all the subdirs.
- I didn't use AC_HELP_STRING to pretty print the help messages in
the top level makefile because we only have autoconf-2.13 available.
- When binutils migrates to an autoconf with html and install-html
support, these rules can be removed.
No regressions on x86_64-pc-linux-gnu.
Please review.
Cheers,
Carlos.
--
Carlos O'Donell
CodeSourcery
carlos@codesourcery.com
(650) 331-3385 x716
ChangeLog | 9
Makefile.def | 6
Makefile.in | 2540 +++++++++++++++++++-
Makefile.tpl | 7
bfd/ChangeLog | 9
bfd/Makefile.am | 55
bfd/Makefile.in | 56
bfd/configure | 11
bfd/configure.in | 6
bfd/doc/ChangeLog | 8
bfd/doc/Makefile.am | 25
bfd/doc/Makefile.in | 23
bfd/po/Make-in | 1
binutils/ChangeLog | 10
binutils/Makefile.am | 29
binutils/Makefile.in | 32
binutils/configure | 10
binutils/configure.in | 5
binutils/doc/Makefile.am | 21
binutils/doc/Makefile.in | 23
binutils/po/Make-in | 1
configure | 354 +-
configure.in | 20
etc/ChangeLog | 6
etc/Makefile.in | 17
etc/configure | 65
etc/configure.in | 5
etc/configure.texi | 4
gas/ChangeLog | 10
gas/Makefile.am | 29
gas/Makefile.in | 32
gas/configure | 9
gas/configure.in | 5
gas/doc/Makefile.am | 21
gas/doc/Makefile.in | 23
gas/po/Make-in | 1
gprof/ChangeLog | 9
gprof/Makefile.am | 48
gprof/Makefile.in | 50
gprof/configure | 129 -
gprof/configure.in | 5
gprof/po/Make-in | 1
intl/ChangeLog | 5
intl/Makefile.in | 4
ld/ChangeLog | 9
ld/Makefile.am | 48
ld/Makefile.in | 50
ld/configure | 9
ld/configure.in | 5
ld/po/Make-in | 1
libiberty/ChangeLog | 9
libiberty/Makefile.in | 57
libiberty/configure | 9
libiberty/configure.ac | 5
libiberty/testsuite/Makefile.in | 2
opcodes/ChangeLog | 5
opcodes/Makefile.am | 3
opcodes/Makefile.in | 3
opcodes/po/Make-in | 1
59 files changed, 3731 insertions(+), 224 deletions(-)
/
2006-03-22 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.tpl: Add install-html target.
* Makefile.def: Add install-html target.
* Makefile.in: Regenerate.
* configure.in: Add --with-datarootdir, --with-docdir,
and --with-htmldir options.
* configure: Regenerate.
bfd/
2006-03-22 Carlos O'Donell <carlos@codesourcery.com>
* po/Make-in: Add install-html target.
* Makefile.am: Rename docdir to bfddocdir. Add datarootdir, docdir
htmldir. Add install-html and install-html-recursive targets.
* Makefile.in: Regenerate.
* configure.in: AC_SUBST for datarootdir, docdir and htmldir.
* configure: Regenerate.
bfd/doc/
2006-03-22 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.am: Add install-html and install-html-am targets.
Define datarootdir, docdir and htmldir.
* Makefile.in: Regenerate.
binutils/
2006-03-22 Carlos O'Donell <carlos@codesourcery.com>
* po/Make-in: Add install-html target.
* Makefile.am: Add install-html and install-html-recursive targets.
* Makefile.in: Regenerate.
* configure.in: AC_SUBST datarootdir, docdir and htmldir.
* configure: Regenerate.
* doc/Makefile.am: Add install-html and install-html-am targets.
* doc/Makefile.in: Regenerate.
etc/
2006-03-22 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.in: Add install-html target. Add htmldir,
docdir and datarootdir.
* configure.texi: Document install-html target.
gas/
2006-03-22 Carlos O'Donell <carlos@codesourcery.com>
* po/Make-in: Add install-html target.
* Makefile.am: Add install-html and install-html-recursive targets.
* Makefile.in: Regenerate.
* configure.in: AC_SUBST datarootdir, docdir, htmldir.
* configure: Regenerate.
* doc/Makefile.am: Add install-html and install-html-am targets.
* doc/Makefile.in: Regenerate.
gprof/
2006-03-22 Carlos O'Donell <carlos@codesourcery.com>
* po/Make-in: Add install-html target.
* Makefile.am: Add install-html, install-html-am and
install-html-recursive targets.
* Makefile.in: Regenerate.
* configure.in: AC_SUBST datarootdir, docdir, htmldir.
* configure: Regenerate.
ld/
2006-03-22 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.am: Add install-html, install-html-am, and
install-html-recursive targets.
* Makefile.in: Regenerate.
* configure.in: AC_SUBST datarootdir, docdir, htmldir.
* configure: Regenerate.
* po/Make-in: Add install-html target.
libiberty/
2006-03-22 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.in: Add install-html, install-html-am, and
install-html-recursive targets. Define mkdir_p and
NORMAL_INSTALL.
* configure.ac: AC_SUBST datarootdir, docdir, htmldir.
* configure: Regenerate.
* testsuite/Makefile.in: Add install-html and html targets.
opcodes/
2006-03-22 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.am: Add install-html target.
* Makefile.in: Regenerate.
intl/
2006-03-21 Carlos O'Donell <carlos@codesourcery.com>
* intl/Makefile.in: Add html info and dvi and install-html to .PHONY
Add install-html target.
Index: Makefile.tpl
===================================================================
RCS file: /cvs/src/src/Makefile.tpl,v
retrieving revision 1.159
diff -u -p -r1.159 Makefile.tpl
--- Makefile.tpl 14 Mar 2006 16:10:08 -0000 1.159
+++ Makefile.tpl 21 Mar 2006 20:36:52 -0000
@@ -53,6 +53,9 @@ libdir = @libdir@
includedir = @includedir@
oldincludedir = @oldincludedir@
infodir = @infodir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+htmldir = @htmldir@
mandir = @mandir@
man1dir = $(mandir)/man1
man2dir = $(mandir)/man2
@@ -532,7 +535,7 @@ do-[+make_target+]:
# Here are the targets which correspond to the do-X targets.
-.PHONY: info installcheck dvi html install-info
+.PHONY: info installcheck dvi html install-info install-html
.PHONY: clean distclean mostlyclean maintainer-clean realclean
.PHONY: local-clean local-distclean local-maintainer-clean
info: do-info
@@ -550,6 +553,8 @@ install-info: do-install-info dir.info
$(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \
else true ; fi
+install-html: do-install-html
+
local-clean:
-rm -f *.a TEMP errs core *.o *~ \#* TAGS *.E *.log
Index: Makefile.def
===================================================================
RCS file: /cvs/src/src/Makefile.def,v
retrieving revision 1.65
diff -u -p -r1.65 Makefile.def
--- Makefile.def 20 Feb 2006 08:34:53 -0000 1.65
+++ Makefile.def 21 Mar 2006 20:36:51 -0000
@@ -155,6 +155,9 @@ recursive_targets = { make_target= TAGS;
recursive_targets = { make_target= install-info;
depend=configure;
depend=info; };
+recursive_targets = { make_target= install-html;
+ depend=configure;
+ depend=html; };
recursive_targets = { make_target= installcheck;
depend=configure; };
recursive_targets = { make_target= mostlyclean; };
@@ -172,7 +175,10 @@ flags_to_pass = { flag= bindir ; };
flags_to_pass = { flag= datadir ; };
flags_to_pass = { flag= exec_prefix ; };
flags_to_pass = { flag= includedir ; };
+flags_to_pass = { flag= datarootdir ; };
+flags_to_pass = { flag= docdir ; };
flags_to_pass = { flag= infodir ; };
+flags_to_pass = { flag= htmldir ; };
flags_to_pass = { flag= libdir ; };
flags_to_pass = { flag= libexecdir ; };
flags_to_pass = { flag= lispdir ; };
Index: configure.in
===================================================================
RCS file: /cvs/src/src/configure.in,v
retrieving revision 1.301
diff -u -p -r1.301 configure.in
--- configure.in 14 Mar 2006 16:10:08 -0000 1.301
+++ configure.in 21 Mar 2006 21:05:32 -0000
@@ -2384,4 +2384,24 @@ case ${enable_werror} in
esac
AC_SUBST(stage2_werror_flag)
+# Flags needed to enable html installing and building
+AC_ARG_WITH(datarootdir,
+[ --with-datarootdir Use datarootdir as the data root directory.],
+[datarootdir="\${prefix}/${withval}"],
+[datarootdir="\${prefix}/share"])
+
+AC_ARG_WITH(docdir,
+[ --with-docdir Install documentation in this directory.],
+[docdir="\${prefix}/${withval}"],
+[docdir="\${datarootdir}/doc"])
+
+AC_ARG_WITH(htmldir,
+[ --with-htmldir Install html in this directory.],
+[htmldir="\${prefix}/${withval}"],
+[htmldir="\${docdir}"])
+
+AC_SUBST(datarootdir)
+AC_SUBST(docdir)
+AC_SUBST(htmldir)
+
AC_OUTPUT(Makefile)
Index: bfd/po/Make-in
===================================================================
RCS file: /cvs/src/src/bfd/po/Make-in,v
retrieving revision 1.7
diff -u -p -r1.7 Make-in
--- bfd/po/Make-in 27 Feb 2006 16:26:22 -0000 1.7
+++ bfd/po/Make-in 21 Mar 2006 20:36:54 -0000
@@ -123,6 +123,7 @@ $(srcdir)/stamp-cat-id: $(PACKAGE).pot
install: install-exec install-data
install-exec:
install-info:
+install-html:
install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
Index: bfd/Makefile.am
===================================================================
RCS file: /cvs/src/src/bfd/Makefile.am,v
retrieving revision 1.172
diff -u -p -r1.172 Makefile.am
--- bfd/Makefile.am 16 Mar 2006 12:20:16 -0000 1.172
+++ bfd/Makefile.am 21 Mar 2006 20:36:53 -0000
@@ -11,10 +11,14 @@ MKDEP = gcc -MM
SUBDIRS = doc po
-docdir = doc
+bfddocdir = doc
bfdlibdir = @bfdlibdir@
bfdincludedir = @bfdincludedir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+htmldir = @htmldir@
+
bfdlib_LTLIBRARIES = libbfd.la
WARN_CFLAGS = @WARN_CFLAGS@
@@ -661,6 +665,35 @@ po/BLD-POTFILES.in: @MAINT@ Makefile $(B
all diststuff: info
+.PHONY: install-html install-html-am install-html-recursive
+
+install-html: install-html-recursive
+
+install-html-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
# Various kinds of .o files to put in libbfd.a:
# BFD_BACKENDS Routines the configured targets need.
# BFD_MACHINES Architecture-specific routines the configured targets need.
@@ -859,12 +892,12 @@ LIBCOFF_H_FILES = libcoff-in.h coffcode.
# Could really use a "copy-if-change"...
headers:
- (cd $(docdir); $(MAKE) protos $(FLAGS_TO_PASS))
- cp $(docdir)/bfd.h bfd-in2.h-new
+ (cd $(bfddocdir); $(MAKE) protos $(FLAGS_TO_PASS))
+ cp $(bfddocdir)/bfd.h bfd-in2.h-new
$(SHELL) $(srcdir)/../move-if-change bfd-in2.h-new $(srcdir)/bfd-in2.h
- cp $(docdir)/libbfd.h libbfd.h-new
+ cp $(bfddocdir)/libbfd.h libbfd.h-new
$(SHELL) $(srcdir)/../move-if-change libbfd.h-new $(srcdir)/libbfd.h
- cp $(docdir)/libcoff.h libcoff.h-new
+ cp $(bfddocdir)/libcoff.h libcoff.h-new
$(SHELL) $(srcdir)/../move-if-change libcoff.h-new $(srcdir)/libcoff.h
# We only rebuild the header files automatically if we have been
@@ -872,22 +905,22 @@ headers:
$(srcdir)/bfd-in2.h: @MAINT@ stmp-bin2-h ; @true
stmp-bin2-h: $(BFD_H_FILES) $(BFD64_H_FILES)
- (cd $(docdir); $(MAKE) $(FLAGS_TO_PASS) bfd.h)
- cp $(docdir)/bfd.h bfd-in2.h-new
+ (cd $(bfddocdir); $(MAKE) $(FLAGS_TO_PASS) bfd.h)
+ cp $(bfddocdir)/bfd.h bfd-in2.h-new
$(SHELL) $(srcdir)/../move-if-change bfd-in2.h-new $(srcdir)/bfd-in2.h
touch stmp-bin2-h
$(srcdir)/libbfd.h: @MAINT@ stmp-lbfd-h ; @true
stmp-lbfd-h: $(LIBBFD_H_FILES)
- (cd $(docdir); $(MAKE) $(FLAGS_TO_PASS) libbfd.h)
- cp $(docdir)/libbfd.h libbfd.h-new
+ (cd $(bfddocdir); $(MAKE) $(FLAGS_TO_PASS) libbfd.h)
+ cp $(bfddocdir)/libbfd.h libbfd.h-new
$(SHELL) $(srcdir)/../move-if-change libbfd.h-new $(srcdir)/libbfd.h
touch stmp-lbfd-h
$(srcdir)/libcoff.h: @MAINT@ stmp-lcoff-h ; @true
stmp-lcoff-h: $(LIBCOFF_H_FILES)
- (cd $(docdir); $(MAKE) $(FLAGS_TO_PASS) libcoff.h)
- cp $(docdir)/libcoff.h libcoff.h-new
+ (cd $(bfddocdir); $(MAKE) $(FLAGS_TO_PASS) libcoff.h)
+ cp $(bfddocdir)/libcoff.h libcoff.h-new
$(SHELL) $(srcdir)/../move-if-change libcoff.h-new $(srcdir)/libcoff.h
touch stmp-lcoff-h
Index: bfd/configure.in
===================================================================
RCS file: /cvs/src/src/bfd/configure.in,v
retrieving revision 1.201
diff -u -p -r1.201 configure.in
--- bfd/configure.in 7 Mar 2006 08:39:21 -0000 1.201
+++ bfd/configure.in 21 Mar 2006 20:36:54 -0000
@@ -957,5 +957,11 @@ esac
rm -f doc/config.status
AC_CONFIG_FILES([Makefile doc/Makefile bfd-in3.h:bfd-in2.h po/Makefile.in:po/Make-in])
AC_CONFIG_COMMANDS([default],[[sed -e '/SRC-POTFILES =/r po/SRC-POTFILES' -e '/BLD-POTFILES =/r po/BLD-POTFILES' po/Makefile.in > po/Makefile]],[[]])
+
+dnl Required by html and install-html
+AC_SUBST(datarootdir)
+AC_SUBST(docdir)
+AC_SUBST(htmldir)
+
AC_OUTPUT
Index: bfd/doc/Makefile.am
===================================================================
RCS file: /cvs/src/src/bfd/doc/Makefile.am,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile.am
--- bfd/doc/Makefile.am 27 Feb 2006 16:26:22 -0000 1.19
+++ bfd/doc/Makefile.am 21 Mar 2006 20:36:54 -0000
@@ -287,3 +287,28 @@ MAINTAINERCLEANFILES = $(DOCFILES)
# We want install to imply install-info as per GNU standards, despite the
# cygnus option.
install: install-info
+
+html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+
+install-html: install-html-am
+
+install-html-am: $(HTMLS)
+ @$(NORMAL_INSTALL)
+ test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
+ @list='$(HTMLS)'; for p in $$list; do \
+ if test -f "$$p" || test -d "$$p"; then d=""; else d="$(srcdir)/"; fi; \
+ f=$(html__strip_dir) \
+ if test -d "$$d$$p"; then \
+ echo " $(mkdir_p) '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(mkdir_p) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
+ echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
+ else \
+ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
+ fi; \
+ done
+
+
+
+
Index: binutils/po/Make-in
===================================================================
RCS file: /cvs/src/src/binutils/po/Make-in,v
retrieving revision 1.4
diff -u -p -r1.4 Make-in
--- binutils/po/Make-in 27 Feb 2006 16:26:22 -0000 1.4
+++ binutils/po/Make-in 21 Mar 2006 20:36:55 -0000
@@ -110,6 +110,7 @@ $(srcdir)/stamp-cat-id: $(PACKAGE).pot
install: install-exec install-data
install-exec:
install-info:
+install-html:
install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
Index: binutils/Makefile.am
===================================================================
RCS file: /cvs/src/src/binutils/Makefile.am,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile.am
--- binutils/Makefile.am 18 Jan 2006 11:01:08 -0000 1.71
+++ binutils/Makefile.am 21 Mar 2006 20:36:54 -0000
@@ -115,6 +115,35 @@ OPCODES = ../opcodes/libopcodes.la
LIBIBERTY = ../libiberty/libiberty.a
+.PHONY: install-html install-html-am install-html-recursive
+
+install-html: install-html-recursive
+
+install-html-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
POTFILES = $(CFILES) $(DEBUG_SRCS) $(HFILES)
po/POTFILES.in: @MAINT@ Makefile
for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \
Index: binutils/configure.in
===================================================================
RCS file: /cvs/src/src/binutils/configure.in,v
retrieving revision 1.60
diff -u -p -r1.60 configure.in
--- binutils/configure.in 9 Feb 2006 11:49:53 -0000 1.60
+++ binutils/configure.in 21 Mar 2006 20:36:55 -0000
@@ -346,6 +346,11 @@ done
AC_SUBST(EMULATION)
AC_SUBST(EMULATION_VECTOR)
+# Required for html and install-html
+AC_SUBST(datarootdir)
+AC_SUBST(docdir)
+AC_SUBST(htmldir)
+
AC_OUTPUT(Makefile doc/Makefile po/Makefile.in:po/Make-in,
[
case "x$CONFIG_FILES" in
Index: binutils/doc/Makefile.am
===================================================================
RCS file: /cvs/src/src/binutils/doc/Makefile.am,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile.am
--- binutils/doc/Makefile.am 11 Oct 2005 04:49:16 -0000 1.10
+++ binutils/doc/Makefile.am 21 Mar 2006 20:36:55 -0000
@@ -157,6 +157,27 @@ $(DEMANGLER_NAME).1: cxxfilt.man Makefil
# cygnus option.
install-data-local: install-info
+html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+
+install-html: install-html-am
+
+install-html-am: $(HTMLS)
+ @$(NORMAL_INSTALL)
+ test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
+ @list='$(HTMLS)'; for p in $$list; do \
+ if test -f "$$p" || test -d "$$p"; then d=""; else d="$(srcdir)/"; fi; \
+ f=$(html__strip_dir) \
+ if test -d "$$d$$p"; then \
+ echo " $(mkdir_p) '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(mkdir_p) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
+ echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
+ else \
+ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
+ fi; \
+ done
+
# Maintenance
# We need it for the taz target in ../../Makefile.in.
Index: etc/Makefile.in
===================================================================
RCS file: /cvs/src/src/etc/Makefile.in,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile.in
--- etc/Makefile.in 27 Feb 2006 16:26:23 -0000 1.5
+++ etc/Makefile.in 21 Mar 2006 20:36:55 -0000
@@ -25,7 +25,10 @@ man6dir = $(mandir)/man6
man7dir = $(mandir)/man7
man8dir = $(mandir)/man8
man9dir = $(mandir)/man9
+datarootdir = @datarootdir@
+docdir = @docdir@
infodir = @infodir@
+htmldir = @htmldir@
SHELL = /bin/sh
@@ -97,6 +100,20 @@ html:
fi; \
done
+install-html: html
+ $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(htmldir)
+ if test ! -f standards.html; then cd $(srcdir); fi; \
+ if test -f standards.html; then \
+ for i in standards.html*; do \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(htmldir)/$$i; \
+ done; \
+ fi
+ if test ! -f configure.html; then cd $(srcdir); fi; \
+ if test -f configure.html; then \
+ for i in configure.html*; do \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(htmldir)/$$i; \
+ done; \
+ fi
dvi:
for f in $(DVIFILES); do \
Index: etc/configure.in
===================================================================
RCS file: /cvs/src/src/etc/configure.in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 configure.in
--- etc/configure.in 3 May 1999 07:29:06 -0000 1.1.1.1
+++ etc/configure.in 21 Mar 2006 20:36:55 -0000
@@ -4,4 +4,9 @@ AC_INIT(Makefile.in)
AC_PROG_INSTALL
+AC_SUBST(datarootdir)
+AC_SUBST(docdir)
+AC_SUBST(htmldir)
+
+
AC_OUTPUT(Makefile)
Index: etc/configure.texi
===================================================================
RCS file: /cvs/src/src/etc/configure.texi,v
retrieving revision 1.3
diff -u -p -r1.3 configure.texi
--- etc/configure.texi 27 Feb 2006 16:26:23 -0000 1.3
+++ etc/configure.texi 21 Mar 2006 20:36:55 -0000
@@ -276,7 +276,9 @@ directory is controlled by @samp{configu
In the Cygnus tree at present, the info files are built and installed as
a separate step. To build them, run @samp{make info}. To install them,
-run @samp{make install-info}.
+run @samp{make install-info}. The equivalent html files are also built
+and installed in a separate step. To build the html files, run
+@samp{make html}. To install the html files run @samp{make install-html}.
All @samp{configure} scripts support a wide variety of options. The
most interesting ones are @samp{--with} and @samp{--enable} options
Index: gas/Makefile.am
===================================================================
RCS file: /cvs/src/src/gas/Makefile.am,v
retrieving revision 1.129
diff -u -p -r1.129 Makefile.am
--- gas/Makefile.am 17 Feb 2006 14:36:23 -0000 1.129
+++ gas/Makefile.am 21 Mar 2006 20:36:56 -0000
@@ -671,6 +671,35 @@ MOSTLYCLEANFILES = $(STAGESTUFF) core \
CLEANFILES = dep.sed DEPTC DEPTCA DEPOBJ DEPOBJA DEP2 DEP2A DEP1 DEPA DEP DEPDIR
+.PHONY: install-html install-html-am install-html-recursive
+
+install-html: install-html-recursive
+
+install-html-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
.PHONY: install-exec-local install-data-local
.PHONY: install-exec-bindir install-exec-tooldir
Index: gas/configure.in
===================================================================
RCS file: /cvs/src/src/gas/configure.in,v
retrieving revision 1.186
diff -u -p -r1.186 configure.in
--- gas/configure.in 17 Feb 2006 14:36:24 -0000 1.186
+++ gas/configure.in 21 Mar 2006 20:36:56 -0000
@@ -669,6 +669,11 @@ GAS_CHECK_DECL_NEEDED(strstr, f, char *(
AC_CHECK_DECLS([vsnprintf])
+dnl Required for html and install-html targets.
+AC_SUBST(datarootdir)
+AC_SUBST(docdir)
+AC_SUBST(htmldir)
+
dnl This must come last.
dnl We used to make symlinks to files in the source directory, but now
Index: gas/doc/Makefile.am
===================================================================
RCS file: /cvs/src/src/gas/doc/Makefile.am,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile.am
--- gas/doc/Makefile.am 27 Feb 2006 16:26:23 -0000 1.42
+++ gas/doc/Makefile.am 21 Mar 2006 20:36:56 -0000
@@ -70,6 +70,27 @@ $(srcdir)/as.info as.dvi as.html: $(srcd
# cygnus option.
install-data-local: install-info
+html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+
+install-html: install-html-am
+
+install-html-am: $(HTMLS)
+ @$(NORMAL_INSTALL)
+ test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
+ @list='$(HTMLS)'; for p in $$list; do \
+ if test -f "$$p" || test -d "$$p"; then d=""; else d="$(srcdir)/"; fi; \
+ f=$(html__strip_dir) \
+ if test -d "$$d$$p"; then \
+ echo " $(mkdir_p) '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(mkdir_p) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
+ echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
+ else \
+ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
+ fi; \
+ done
+
# This one isn't ready for prime time yet. Not even a little bit.
noinst_TEXINFOS = internals.texi
Index: gas/po/Make-in
===================================================================
RCS file: /cvs/src/src/gas/po/Make-in,v
retrieving revision 1.4
diff -u -p -r1.4 Make-in
--- gas/po/Make-in 27 Feb 2006 16:26:23 -0000 1.4
+++ gas/po/Make-in 21 Mar 2006 20:36:56 -0000
@@ -110,6 +110,7 @@ $(srcdir)/stamp-cat-id: $(PACKAGE).pot
install: install-exec install-data
install-exec:
install-info:
+install-html:
install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
Index: gprof/Makefile.am
===================================================================
RCS file: /cvs/src/src/gprof/Makefile.am,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile.am
--- gprof/Makefile.am 27 Dec 2005 01:21:27 -0000 1.25
+++ gprof/Makefile.am 21 Mar 2006 20:36:57 -0000
@@ -75,6 +75,54 @@ gprof.1: $(srcdir)/gprof.texi config.tex
(rm -f $@.T$$$$ && exit 1)
rm -f gprof.pod
+.PHONY: install-html install-html-am install-html-recursive
+
+html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+
+install-html: install-html-recursive install-html-am
+
+install-html-am: $(HTMLS)
+ @$(NORMAL_INSTALL)
+ test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
+ @list='$(HTMLS)'; for p in $$list; do \
+ if test -f "$$p" || test -d "$$p"; then d=""; else d="$(srcdir)/"; fi; \
+ f=$(html__strip_dir) \
+ if test -d "$$d$$p"; then \
+ echo " $(mkdir_p) '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(mkdir_p) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
+ echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
+ else \
+ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
+ fi; \
+ done
+
+install-html-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
# We want install to imply install-info as per GNU standards, despite the
# cygnus option.
install-data-local: install-info
Index: gprof/configure.in
===================================================================
RCS file: /cvs/src/src/gprof/configure.in,v
retrieving revision 1.27
diff -u -p -r1.27 configure.in
--- gprof/configure.in 3 Oct 2005 10:53:35 -0000 1.27
+++ gprof/configure.in 21 Mar 2006 20:36:57 -0000
@@ -44,6 +44,11 @@ fi
AM_BINUTILS_WARNINGS
+dnl Required by html and install-html
+AC_SUBST(datarootdir)
+AC_SUBST(docdir)
+AC_SUBST(htmldir)
+
AC_CONFIG_FILES([Makefile po/Makefile.in:po/Make-in])
AC_CONFIG_COMMANDS([default],[[sed -e '/POTFILES =/r po/POTFILES' po/Makefile.in > po/Makefile]],[[]])
AC_OUTPUT
Index: gprof/po/Make-in
===================================================================
RCS file: /cvs/src/src/gprof/po/Make-in,v
retrieving revision 1.6
diff -u -p -r1.6 Make-in
--- gprof/po/Make-in 27 Feb 2006 16:26:23 -0000 1.6
+++ gprof/po/Make-in 21 Mar 2006 20:36:57 -0000
@@ -110,6 +110,7 @@ $(srcdir)/stamp-cat-id: $(PACKAGE).pot
install: install-exec install-data
install-exec:
install-info:
+install-html:
install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
Index: intl/Makefile.in
===================================================================
RCS file: /cvs/src/src/intl/Makefile.in,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile.in
--- intl/Makefile.in 27 Feb 2006 16:26:23 -0000 1.5
+++ intl/Makefile.in 21 Mar 2006 20:36:57 -0000
@@ -149,8 +149,12 @@ uninstall:
rm -f $(gettextsrcdir)/$$file; \
done
+.PHONY: html info dvi
html info dvi:
+.PHONY: install-html
+install-html:
+
$(OBJECTS): config.h libgettext.h
bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h
dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h
Index: ld/Makefile.am
===================================================================
RCS file: /cvs/src/src/ld/Makefile.am,v
retrieving revision 1.203
diff -u -p -r1.203 Makefile.am
--- ld/Makefile.am 7 Mar 2006 08:39:21 -0000 1.203
+++ ld/Makefile.am 21 Mar 2006 20:36:57 -0000
@@ -1713,6 +1713,54 @@ mostlyclean-local:
-rm -rf tmpdir
CLEANFILES = dep.sed DEP DEPA DEP1 DEP2
+.PHONY: install-html install-html-am install-html-recursive
+
+html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+
+install-html: install-html-recursive install-html-am
+
+install-html-am: $(HTMLS)
+ @$(NORMAL_INSTALL)
+ test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
+ @list='$(HTMLS)'; for p in $$list; do \
+ if test -f "$$p" || test -d "$$p"; then d=""; else d="$(srcdir)/"; fi; \
+ f=$(html__strip_dir) \
+ if test -d "$$d$$p"; then \
+ echo " $(mkdir_p) '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(mkdir_p) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
+ echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
+ else \
+ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
+ fi; \
+ done
+
+install-html-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
.PHONY: install-exec-local install-data-local
install-exec-local: ld-new$(EXEEXT)
Index: ld/configure.in
===================================================================
RCS file: /cvs/src/src/ld/configure.in,v
retrieving revision 1.34
diff -u -p -r1.34 configure.in
--- ld/configure.in 16 Jan 2006 16:15:16 -0000 1.34
+++ ld/configure.in 21 Mar 2006 20:36:58 -0000
@@ -253,5 +253,10 @@ if test x${EXTRA_SHLIB_EXTENSION} != x ;
[Additional extension a shared object might have.])
fi
+dnl Required by html and install-html
+AC_SUBST(datarootdir)
+AC_SUBST(docdir)
+AC_SUBST(htmldir)
+
AC_OUTPUT(Makefile po/Makefile.in:po/Make-in,
[sed -e '/POTFILES =/r po/POTFILES' po/Makefile.in > po/Makefile])
Index: ld/po/Make-in
===================================================================
RCS file: /cvs/src/src/ld/po/Make-in,v
retrieving revision 1.4
diff -u -p -r1.4 Make-in
--- ld/po/Make-in 27 Feb 2006 16:26:25 -0000 1.4
+++ ld/po/Make-in 21 Mar 2006 20:36:58 -0000
@@ -110,6 +110,7 @@ $(srcdir)/stamp-cat-id: $(PACKAGE).pot
install: install-exec install-data
install-exec:
install-info:
+install-html:
install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
Index: libiberty/Makefile.in
===================================================================
RCS file: /cvs/src/src/libiberty/Makefile.in,v
retrieving revision 1.80
diff -u -p -r1.80 Makefile.in
--- libiberty/Makefile.in 26 Sep 2005 21:02:59 -0000 1.80
+++ libiberty/Makefile.in 21 Mar 2006 20:37:00 -0000
@@ -245,7 +245,62 @@ info: libiberty.info info-subdir
install-info: install-info-subdir
clean-info: clean-info-subdir
dvi: libiberty.dvi dvi-subdir
-html: libiberty.html
+
+# html, install-html targets
+HTMLS = libiberty.html
+
+html: $(HTMLS)
+
+.PHONY: install-html install-html-am install-html-recursive
+
+NORMAL_INSTALL = :
+mkdir_p = mkdir -p --
+
+html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+
+install-html: install-html-recursive install-html-am
+
+install-html-am: $(HTMLS)
+ @$(NORMAL_INSTALL)
+ test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
+ @list='$(HTMLS)'; for p in $$list; do \
+ if test -f "$$p" || test -d "$$p"; then d=""; else d="$(srcdir)/"; fi; \
+ f=$(html__strip_dir) \
+ if test -d "$$d$$p"; then \
+ echo " $(mkdir_p) '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(mkdir_p) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
+ echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
+ else \
+ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
+ fi; \
+ done
+
+install-html-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
TEXISRC = \
$(srcdir)/libiberty.texi \
Index: libiberty/configure.ac
===================================================================
RCS file: /cvs/src/src/libiberty/configure.ac,v
retrieving revision 1.30
diff -u -p -r1.30 configure.ac
--- libiberty/configure.ac 29 Jan 2006 20:07:09 -0000 1.30
+++ libiberty/configure.ac 21 Mar 2006 20:37:00 -0000
@@ -639,6 +639,11 @@ for l in x $LIBOBJS; do
done
LIBOBJS="$L"
+dnl Required by html and install-html
+AC_SUBST(datarootdir)
+AC_SUBST(docdir)
+AC_SUBST(htmldir)
+
# We need multilib support, but only if configuring for the target.
AC_CONFIG_FILES([Makefile testsuite/Makefile])
AC_CONFIG_COMMANDS([default],
Index: libiberty/testsuite/Makefile.in
===================================================================
RCS file: /cvs/src/src/libiberty/testsuite/Makefile.in,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.in
--- libiberty/testsuite/Makefile.in 21 Jan 2006 04:28:49 -0000 1.8
+++ libiberty/testsuite/Makefile.in 21 Mar 2006 20:37:00 -0000
@@ -73,7 +73,7 @@ test-expandargv: $(srcdir)/test-expandar
$(srcdir)/test-expandargv.c ../libiberty.a
# Standard (either GNU or Cygnus) rules we don't use.
-info install-info clean-info dvi install etags tags installcheck:
+html install-html info install-info clean-info dvi install etags tags installcheck:
# The standard clean rules.
mostlyclean:
Index: opcodes/Makefile.am
===================================================================
RCS file: /cvs/src/src/opcodes/Makefile.am,v
retrieving revision 1.97
diff -u -p -r1.97 Makefile.am
--- opcodes/Makefile.am 17 Feb 2006 14:36:28 -0000 1.97
+++ opcodes/Makefile.am 21 Mar 2006 20:37:00 -0000
@@ -15,6 +15,9 @@ AM_CFLAGS = $(WARN_CFLAGS)
bfdlibdir = @bfdlibdir@
bfdincludedir = @bfdincludedir@
+.PHONY: install-html
+install-html:
+
bfdlib_LTLIBRARIES = libopcodes.la
# This is where bfd.h lives.
Index: opcodes/po/Make-in
===================================================================
RCS file: /cvs/src/src/opcodes/po/Make-in,v
retrieving revision 1.4
diff -u -p -r1.4 Make-in
--- opcodes/po/Make-in 27 Feb 2006 16:26:26 -0000 1.4
+++ opcodes/po/Make-in 21 Mar 2006 20:37:01 -0000
@@ -110,6 +110,7 @@ $(srcdir)/stamp-cat-id: $(PACKAGE).pot
install: install-exec install-data
install-exec:
install-info:
+install-html:
install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
--
Carlos O'Donell
CodeSourcery
carlos@codesourcery.com
(650) 331-3385 x716