binutils/

	* 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.
gas/
	* doc/Makefile.am (AM_MAKEINFOFLAGS): New.
	(TEXI2POD): Use AM_MAKEINFOFLAGS.
	(asconfig.texi): Don't set top_srcdir.
	* doc/as.texinfo: Don't use top_srcdir.
	* aclocal.m4, Makefile.in, doc/Makefile.in: Regenerated.
ld/
	* Makefile.am (AM_MAKEINFOFLAGS): Add libiberty.
	(TEXI2POD): Use AM_MAKEINFOFLAGS.
	(configdoc.texi): Don't set top_srcdir.
	* ld.texinfo: Don't use top_srcdir.
	* aclocal.m4, Makefile.in: Regenerated.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 869ed94d1c6f726395bfab646e61305a8a1a229a..867a84f999f5fd559cee3f5a3d509200c86cedc9 100644 (file)
--- 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 2741df788ffdda5d826a73f5acca9e68b55dd170..9cd449f644e3953d68667e65a813f777ff980371 100644 (file)
--- 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 ca849970a1b18a5c575b286bfbac55e55c54face..cd4267338b72efdd73157574ab3a71e3be2dcc30 100644 (file)
--- 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 3f79ad4066f454adb6ad6c749cbf7fcd684c0a5c..fe50d212188c9c48e82b21d2cfc15f26905a84ee 100644 (file)
--- 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 3558fc70e771d2280a17ce343f68839dbe32606b..7094a612455973e9e457908bca33fce4cbc43aa9 100644 (file)
--- 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 c7d30d5f226f33948f55aa3efd1c94e9d286c9fa..be571d2a7cc9823d2bbb37ec03eaea5139906dc9 100644 (file)
--- 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

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 8ab4b75fae835e89cdc0e39348f3881fc1c18598..baebce1ff80f479494890601421e615d3384436c 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-02  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * doc/Makefile.am (AM_MAKEINFOFLAGS): New.
+       (TEXI2POD): Use AM_MAKEINFOFLAGS.
+       (asconfig.texi): Don't set top_srcdir.
+       * doc/as.texinfo: Don't use top_srcdir.
+       * aclocal.m4, Makefile.in, doc/Makefile.in: Regenerated.
+
 2006-05-02  Paul Brook  <paul@codesourcery.com>
 
        * config/tc-arm.c (arm_optimize_expr): New function.

diff --git a/gas/Makefile.in b/gas/Makefile.in
index bdd1448d21f8861bf3e90b5c1de39454c2a054ff..190d01caee390b9bb0b16a464f9b43081389fdbf 100644 (file)
--- a/gas/Makefile.in
+++ b/gas/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,
@@ -15,8 +15,6 @@
 @SET_MAKE@
 
 
-SOURCES = $(as_new_SOURCES) $(EXTRA_as_new_SOURCES) $(itbl_test_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@

diff --git a/gas/aclocal.m4 b/gas/aclocal.m4
index ca849970a1b18a5c575b286bfbac55e55c54face..cd4267338b72efdd73157574ab3a71e3be2dcc30 100644 (file)
--- a/gas/aclocal.m4
+++ b/gas/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/gas/doc/Makefile.am b/gas/doc/Makefile.am
index cc806ca3d80b7e9bab39e0113e4d2d83b717656b..99e8390bc4144ea224dfb357edb4f7aedcaf8f7e 100644 (file)
--- a/gas/doc/Makefile.am
+++ b/gas/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 $(BASEDIR)/etc/texi2pod.pl $(AM_MAKEINFOFLAGS)
 
 POD2MAN = pod2man --center="GNU Development Tools" \
        --release="binutils-$(VERSION)" --section=1
@@ -17,11 +17,12 @@ man_MANS = as.1
 
 info_TEXINFOS = as.texinfo 
 
+AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty"
+
 asconfig.texi: $(CONFIG).texi
        rm -f asconfig.texi
        cp $(srcdir)/$(CONFIG).texi ./asconfig.texi
        chmod u+w ./asconfig.texi
-       echo "@set top_srcdir $(top_srcdir)" >> ./asconfig.texi
 
 CPU_DOCS = \
        c-alpha.texi \

diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in
index 687e4727a4fb182ca8c21ab009a52052d32c1229..75646b6253a1292167881f09bf05c8f43948706f 100644 (file)
--- a/gas/doc/Makefile.in
+++ b/gas/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,
@@ -211,12 +211,13 @@ CONFIG = all
 
 # Options to extract the man page from as.texinfo
 MANCONF = -Dman
-TEXI2POD = perl $(top_srcdir)/../etc/texi2pod.pl
+TEXI2POD = perl $(BASEDIR)/etc/texi2pod.pl $(AM_MAKEINFOFLAGS)
 POD2MAN = pod2man --center="GNU Development Tools" \
        --release="binutils-$(VERSION)" --section=1
 
 man_MANS = as.1
 info_TEXINFOS = as.texinfo 
+AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty"
 CPU_DOCS = \
        c-alpha.texi \
        c-arc.texi \
@@ -308,9 +309,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 $@ $<; \
@@ -352,6 +355,7 @@ as.dvi: as.texinfo
 as.pdf: as.texinfo 
 as.html: as.texinfo 
 .dvi.ps:
+       TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
        $(DVIPS) -o $@ $<
 
 uninstall-info-am:
@@ -384,10 +388,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
 
@@ -585,7 +592,6 @@ asconfig.texi: $(CONFIG).texi
        rm -f asconfig.texi
        cp $(srcdir)/$(CONFIG).texi ./asconfig.texi
        chmod u+w ./asconfig.texi
-       echo "@set top_srcdir $(top_srcdir)" >> ./asconfig.texi
 
 gasver.texi: $(srcdir)/../../bfd/configure
        rm -f $@

diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo
index dfe786075cf9635ae9ce4751725c9f6f14c1405b..dbf1d7dbe79f4b5cf435769e5c9b99e87adf5976 100644 (file)
--- a/gas/doc/as.texinfo
+++ b/gas/doc/as.texinfo
@@ -451,7 +451,7 @@ gcc(1), ld(1), and the Info entries for @file{binutils} and @file{ld}.
 @c man begin OPTIONS
 
 @table @gcctabopt
-@include @value{top_srcdir}/../libiberty/at-file.texi
+@include at-file.texi
 
 @item -a[cdhlmns]
 Turn on listings, in any of a variety of ways:

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 6d7631597b56726d79f77e73e7223d94bff5e012..c323a928ab0926f013833940e1a2fd4cf4c74c6f 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-02  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * Makefile.am (AM_MAKEINFOFLAGS): Add libiberty.
+       (TEXI2POD): Use AM_MAKEINFOFLAGS.
+       (configdoc.texi): Don't set top_srcdir.
+       * ld.texinfo: Don't use top_srcdir.
+       * aclocal.m4, Makefile.in: Regenerated.
+
 2006-04-19  Alan Modra  <amodra@bigpond.net.au>
 
        * ldlang.c (wild): Tidy default_common_section loop.

diff --git a/ld/Makefile.am b/ld/Makefile.am
index 3c4fa5ee666bf22075959274238c436b618817f0..61581acd7aca80bd01e3042f40218499bb45f72c 100644 (file)
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -46,7 +46,7 @@ DOCVER = gen
 # Options to extract the man page from ld.texinfo
 MANCONF = -Dman
 
-TEXI2POD = perl $(BASEDIR)/etc/texi2pod.pl
+TEXI2POD = perl $(BASEDIR)/etc/texi2pod.pl $(AM_MAKEINFOFLAGS)
 
 POD2MAN = pod2man --center="GNU Development Tools" \
        --release="binutils-$(VERSION)" --section=1
@@ -97,7 +97,7 @@ info_TEXINFOS = ld.texinfo
 noinst_TEXINFOS = ldint.texinfo
 man_MANS = ld.1
 
-AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc
+AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc -I $(top_srcdir)/../libiberty
 TEXI2DVI = texi2dvi -I $(srcdir) -I $(BFDDIR)/doc
 
 INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) -I$(top_srcdir)/../intl -I../intl $(HDEFINES) $(CFLAGS) -DLOCALEDIR="\"$(datadir)/locale\""
@@ -1702,7 +1702,6 @@ bootstrap: ld3$(EXEEXT)
 configdoc.texi:        ${DOCVER}-doc.texi
        cp ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi
        chmod u+w ./configdoc.texi
-       echo "@set top_srcdir $(top_srcdir)" >> ./configdoc.texi
 
 ldver.texi: $(srcdir)/../bfd/configure
        rm -f $@

diff --git a/ld/Makefile.in b/ld/Makefile.in
index 30b925596b755ece6a461d27dc162179d6693c82..8c9029fd4af89c9010a786ae2fadc77e5c386bca 100644 (file)
--- a/ld/Makefile.in
+++ b/ld/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 = $(ld_new_SOURCES) $(EXTRA_ld_new_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -282,7 +280,7 @@ DOCVER = gen
 
 # Options to extract the man page from ld.texinfo
 MANCONF = -Dman
-TEXI2POD = perl $(BASEDIR)/etc/texi2pod.pl
+TEXI2POD = perl $(BASEDIR)/etc/texi2pod.pl $(AM_MAKEINFOFLAGS)
 POD2MAN = pod2man --center="GNU Development Tools" \
        --release="binutils-$(VERSION)" --section=1
 
@@ -326,7 +324,7 @@ CXX_FOR_TARGET = ` \
 info_TEXINFOS = ld.texinfo
 noinst_TEXINFOS = ldint.texinfo
 man_MANS = ld.1
-AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc
+AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc -I $(top_srcdir)/../libiberty
 TEXI2DVI = texi2dvi -I $(srcdir) -I $(BFDDIR)/doc
 INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) -I$(top_srcdir)/../intl -I../intl $(HDEFINES) $(CFLAGS) -DLOCALEDIR="\"$(datadir)/locale\""
 BFDLIB = ../bfd/libbfd.la
@@ -801,9 +799,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 $@ $<; \
@@ -813,7 +813,7 @@ distclean-libtool:
        else \
          rc=$$?; \
          cd $(srcdir) && \
-         $$restore $$backupdir/* `echo "$@" | sed 's|[^/]*$$||'`; \
+         $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
        fi; \
        rm -rf $$backupdir; exit $$rc
 
@@ -845,6 +845,7 @@ ld.dvi: ld.texinfo
 ld.pdf: ld.texinfo 
 ld.html: ld.texinfo 
 .dvi.ps:
+       TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
        $(DVIPS) -o $@ $<
 
 uninstall-info-am:
@@ -877,10 +878,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
 
@@ -2501,7 +2505,6 @@ bootstrap: ld3$(EXEEXT)
 configdoc.texi:        ${DOCVER}-doc.texi
        cp ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi
        chmod u+w ./configdoc.texi
-       echo "@set top_srcdir $(top_srcdir)" >> ./configdoc.texi
 
 ldver.texi: $(srcdir)/../bfd/configure
        rm -f $@

diff --git a/ld/aclocal.m4 b/ld/aclocal.m4
index ca849970a1b18a5c575b286bfbac55e55c54face..cd4267338b72efdd73157574ab3a71e3be2dcc30 100644 (file)
--- a/ld/aclocal.m4
+++ b/ld/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/ld/ld.texinfo b/ld/ld.texinfo
index 339b32d045b77f38372ccb29efcfb04401e2f657..4bf5a2c92edac7828b0afe67bf6d170656cc8948 100644 (file)
--- a/ld/ld.texinfo
+++ b/ld/ld.texinfo
@@ -342,7 +342,7 @@ Here is a table of the generic command line switches accepted by the GNU
 linker:
 
 @table @gcctabopt
-@include @value{top_srcdir}/../libiberty/at-file.texi
+@include at-file.texi
 
 @kindex -a@var{keyword}
 @item -a@var{keyword}