diff options
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/ChangeLog | 8 | ||||
| -rw-r--r-- | binutils/Makefile.in | 4 | ||||
| -rw-r--r-- | binutils/aclocal.m4 | 4 | ||||
| -rw-r--r-- | binutils/doc/Makefile.am | 5 | ||||
| -rw-r--r-- | binutils/doc/Makefile.in | 26 | ||||
| -rw-r--r-- | binutils/doc/binutils.texi | 2 |
6 files changed, 31 insertions, 18 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 869ed94..867a84f 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,11 @@ +2006-05-02 Daniel Jacobowitz <dan@codesourcery.com> + + * doc/Makefile.am (AM_MAKEINFOFLAGS): New. + (TEXI2POD): Use AM_MAKEINFOFLAGS. + (config.texi): Don't set top_srcdir. + * doc/binutils.texi: Don't use top_srcdir. + * aclocal.m4, Makefile.in, doc/Makefile.in: Regenerated. + 2006-04-26 Julian Brown <julian@codesourcery.com> * readelf.c (arm_attr_tag_VFP_arch): Add VFPv3. diff --git a/binutils/Makefile.in b/binutils/Makefile.in index 2741df7..9cd449f 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,6 @@ @SET_MAKE@ -SOURCES = $(addr2line_SOURCES) $(ar_SOURCES) $(coffdump_SOURCES) $(cxxfilt_SOURCES) $(dlltool_SOURCES) $(dllwrap_SOURCES) $(nlmconv_SOURCES) $(nm_new_SOURCES) $(objcopy_SOURCES) $(objdump_SOURCES) $(ranlib_SOURCES) $(readelf_SOURCES) $(size_SOURCES) $(srconv_SOURCES) $(strings_SOURCES) $(strip_new_SOURCES) $(sysdump_SOURCES) $(windres_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ diff --git a/binutils/aclocal.m4 b/binutils/aclocal.m4 index ca84997..cd42673 100644 --- a/binutils/aclocal.m4 +++ b/binutils/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.9.5 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005 Free Software Foundation, Inc. @@ -28,7 +28,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.5])]) + [AM_AUTOMAKE_VERSION([1.9.6])]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am index 3f79ad4..fe50d21 100644 --- a/binutils/doc/Makefile.am +++ b/binutils/doc/Makefile.am @@ -8,7 +8,7 @@ CONFIG=all # Options to extract the man page from as.texinfo MANCONF = -Dman -TEXI2POD = perl $(top_srcdir)/../etc/texi2pod.pl +TEXI2POD = perl $(top_srcdir)/../etc/texi2pod.pl $(AM_MAKEINFOFLAGS) POD2MAN = pod2man --center="GNU Development Tools" \ --release="binutils-$(VERSION)" --section=1 @@ -34,12 +34,13 @@ info_TEXINFOS = binutils.texi binutils_TEXINFOS = config.texi binutils_TEXI = $(srcdir)/binutils.texi +AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" + config.texi: $(srcdir)/../../bfd/configure $(binutils_TEXI) rm -f config.texi eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \ echo "@set VERSION $$VERSION" > $@ echo "@set UPDATED `date "+%B %Y"`" >> config.texi - echo "@set top_srcdir $(top_srcdir)" >> config.texi # Man page generation from texinfo addr2line.1: $(binutils_TEXI) diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in index 3558fc7..7094a61 100644 --- a/binutils/doc/Makefile.in +++ b/binutils/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -217,7 +217,7 @@ CONFIG = all # Options to extract the man page from as.texinfo MANCONF = -Dman -TEXI2POD = perl $(top_srcdir)/../etc/texi2pod.pl +TEXI2POD = perl $(top_srcdir)/../etc/texi2pod.pl $(AM_MAKEINFOFLAGS) POD2MAN = pod2man --center="GNU Development Tools" \ --release="binutils-$(VERSION)" --section=1 @@ -242,6 +242,7 @@ man_MANS = \ info_TEXINFOS = binutils.texi binutils_TEXINFOS = config.texi binutils_TEXI = $(srcdir)/binutils.texi +AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" MAINTAINERCLEANFILES = config.texi MOSTLYCLEANFILES = $(DEMANGLER_NAME).1 html__strip_dir = `echo $$p | sed -e 's|^.*/||'`; @@ -292,9 +293,11 @@ distclean-libtool: restore=: && backupdir="$(am__leading_dot)am$$$$" && \ am__cwd=`pwd` && cd $(srcdir) && \ rm -rf $$backupdir && mkdir $$backupdir && \ - for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \ - if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \ - done; \ + if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ + for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \ + if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \ + done; \ + else :; fi && \ cd "$$am__cwd"; \ if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ -o $@ $<; \ @@ -336,6 +339,7 @@ binutils.dvi: binutils.texi $(binutils_TEXINFOS) binutils.pdf: binutils.texi $(binutils_TEXINFOS) binutils.html: binutils.texi $(binutils_TEXINFOS) .dvi.ps: + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ $(DVIPS) -o $@ $< uninstall-info-am: @@ -368,10 +372,13 @@ dist-info: $(INFO_DEPS) $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \ esac; \ if test -f $$base; then d=.; else d=$(srcdir); fi; \ - for file in $$d/$$base*; do \ - relfile=`expr "$$file" : "$$d/\(.*\)"`; \ - test -f $(distdir)/$$relfile || \ - cp -p $$file $(distdir)/$$relfile; \ + base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \ + for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \ + if test -f $$file; then \ + relfile=`expr "$$file" : "$$d/\(.*\)"`; \ + test -f $(distdir)/$$relfile || \ + cp -p $$file $(distdir)/$$relfile; \ + else :; fi; \ done; \ done @@ -574,7 +581,6 @@ config.texi: $(srcdir)/../../bfd/configure $(binutils_TEXI) eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \ echo "@set VERSION $$VERSION" > $@ echo "@set UPDATED `date "+%B %Y"`" >> config.texi - echo "@set top_srcdir $(top_srcdir)" >> config.texi # Man page generation from texinfo addr2line.1: $(binutils_TEXI) diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi index c7d30d5..be571d2 100644 --- a/binutils/doc/binutils.texi +++ b/binutils/doc/binutils.texi @@ -3525,7 +3525,7 @@ programs described in this manual. @c man begin OPTIONS @table @env -@include @value{top_srcdir}/../libiberty/at-file.texi +@include at-file.texi @c man end @item --help |