* Makefile.am (install-exec-local): Remove common term from string

	comparison.
	* Makefile.in: Regenerate.
	* doc/Makefile.am: Don't use $<.
	* doc/Makefile.in: Regenerate.

5 files changed, 108 insertions, 100 deletions

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 208f96e..90fae1d 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,14 +1,22 @@
+2003-11-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (install-exec-local): Remove common term from string
+	comparison.
+	* Makefile.in: Regenerate.
+	* doc/Makefile.am: Don't use $<.
+	* doc/Makefile.in: Regenerate.
+
 2003-11-27  Nick Clifton  <nickc@redhat.com>
 
 	* rename.c (smart_rename): Make sure that we have write
 	permission on the destination file before renaming.
 
 2003-11-26  Daniel Jacobowitz <drow@mvista.com>
-            Nick Clifton  <nickc@redhat.com>
+	    Nick Clifton  <nickc@redhat.com>
 
 	* readelf.c: Add a comment describing the difference between
 	readelf and objdump.
-        * doc/binutils.texi (readelf): Likewise.
+	* doc/binutils.texi (readelf): Likewise.
 
 2003-11-25  Danny Smith  <dannysmith@users.sourceforge.net>
 
@@ -35,10 +43,10 @@
 	a few fields.  Use the symbol_is_valid field to check the
 	validity of located symbols and continue searching if they are
 	not valid.
-        (objdump_print_addr): Alter parameters passed to
+	(objdump_print_addr): Alter parameters passed to
 	find_symbol_for_address.
-        (objdump_symbol_at_address): Likewise.
-        (disassemble_section): Likewise.  Also use symbol_is_valid
+	(objdump_symbol_at_address): Likewise.
+	(disassemble_section): Likewise.  Also use symbol_is_valid
 	function to check the validity of located symbols.
 
 2003-11-13  Tobias Burnus  <tobias.burnus@physik.fu-berlin.de>
@@ -264,30 +272,30 @@
 2003-09-03  Nick Clifton  <nickc@redhat.com>
 
 	* objdump.c (struct objdump_disasm_info): Add new fields
-        'dynrelbuf', 'dynrelcount' and 'disassemble_fn'.
-        (process_section_p): New function:  Returns TRUE if a section
-        can be dumped.
-        (disassemble_section): New function: Contains the body of
+	'dynrelbuf', 'dynrelcount' and 'disassemble_fn'.
+	(process_section_p): New function:  Returns TRUE if a section
+	can be dumped.
+	(disassemble_section): New function: Contains the body of
 	disassemble_data(), but just for one section.
-        (disassemble_data): Use bfd_map_over_sections to walk section
-        chain.
-        (find_stabs_section): New function: Find a stabs containing
-        section and then dump it.
-        (dump_stabs_section): New function: Use bfd_map_over_sections
-        to find the section to dump.
-        (dump_stabs): Use dump_stabs_section.
-        (dump_section): New function: Display the contents of a
-        section.
-        (dump_data): Use bfd_map_over_sections to display section
-        contents.
-        (dump_relocs_in_section): Display the relocs in a given section.
-        (dump_relocs): Use bfd_map_over_sections to display relocs.
+	(disassemble_data): Use bfd_map_over_sections to walk section
+	chain.
+	(find_stabs_section): New function: Find a stabs containing
+	section and then dump it.
+	(dump_stabs_section): New function: Use bfd_map_over_sections
+	to find the section to dump.
+	(dump_stabs): Use dump_stabs_section.
+	(dump_section): New function: Display the contents of a
+	section.
+	(dump_data): Use bfd_map_over_sections to display section
+	contents.
+	(dump_relocs_in_section): Display the relocs in a given section.
+	(dump_relocs): Use bfd_map_over_sections to display relocs.
 	(adjust_addresses): New function: Adjust the vma and lma of
-        sections.
-        (dump_bfd): Use bfd_map_over_sections.
-        * doc/binutils.texi: Document the "objdump -s" (no longer)
-        dumps empty sections.
-        
+	sections.
+	(dump_bfd): Use bfd_map_over_sections.
+	* doc/binutils.texi: Document the "objdump -s" (no longer)
+	dumps empty sections.
+
 2003-08-24  Jonathan R. Grant  <jg-binutils@jguk.org>
 
 	* objdump.c: Improve comments/documentation.
@@ -332,7 +340,7 @@
 	* NEWS: Document readelf's new ability.
 	* doc/binutils: Alter text to say that readelf supports archives
 	and 64-bit ELF files.
-	
+
 2003-08-08  Nick Clifton  <nickc@redhat.com>
 
 	* po/fr.po: Updated French translation.
@@ -395,26 +403,26 @@
 
 	* objdump.c: New command line option --debugging-tags.
 	* doc/binutils.texi: Document new command line option.
-	* prdbg.c: Code to print the debug info as tags compatible 
+	* prdbg.c: Code to print the debug info as tags compatible
 	with ctags.
 	* budbg.h: Adjust prototype.
 	* NEWS: Mention new switch
-        
+
 2003-07-18  Nick Clifton  <nickc@redhat.com>
 
 	* objdump.c (main) :Accept multiple -M switch.
-        * doc/binutils.texi: Document that multiple -M switches are
-        accepted and that a single -M switch can contain comma
-        separated options.
+	* doc/binutils.texi: Document that multiple -M switches are
+	accepted and that a single -M switch can contain comma
+	separated options.
 
 2003-07-17  Nick Clifton  <nickc@redhat.com>
 
 	* objdump.c (main): Issue a warning message if multiple -M
 	switches are used.
-	
+
 	* doc/binutils.texi (objdump): Update documentation about -M
 	option.
-	
+
 2003-07-17  Nick Clifton  <nickc@redhat.com>
 
 	* po/es.po: New Spanish translation.
@@ -493,16 +501,16 @@
 2003-06-26  Nick Clifton  <nickc@redhat.com>
 
 	* objcopy (enum strip_action): Add STRIP_NONDEBUG.
-        (OPTION_ONLY_KEEP_DEBUG): New.
-        (strip_options): Add --only-keep-debug.
-        (copy_options): Likewise.
-        (is_strip_section): Invert return value if STRIP_NONDEBUG is
-        active.
-        (copy_object): Do not copy private data when STRIP_NONDEBUG is
-        active.
-        (setup_section): Likewise.
-        (strip_main): Handle --only-keep-debug.
-        (copy_main): Likewise.
+	(OPTION_ONLY_KEEP_DEBUG): New.
+	(strip_options): Add --only-keep-debug.
+	(copy_options): Likewise.
+	(is_strip_section): Invert return value if STRIP_NONDEBUG is
+	active.
+	(copy_object): Do not copy private data when STRIP_NONDEBUG is
+	active.
+	(setup_section): Likewise.
+	(strip_main): Handle --only-keep-debug.
+	(copy_main): Likewise.
 	* NEWS: Mention new switch
 	* doc/binutils.texi: Document new switch.
 
@@ -521,20 +529,20 @@
 2003-06-11  Nick Clifton  <nickc@redhat.com>
 
 	* objcopy.c (gnu_debuglink_filename): New variable.
-        (OPTION_ADD_GNU_DEBUGLINK): New switch
-        (copy_options): Describe --add-gnu-debuglink switch.
-        Mention that --strip-debug removes sections as well.
-        (is_strip_section): Process the sections removed and kept
-        lists before checking for debugging sections.
-        (add_redefine_syms_file): Make function static.
-        (copy_object): Use is_strip_section.
-        Check to see if a .gnu_debuglink section should be added.  If
-        so, call bfd_add_gnu_debuglink.
-        (setup_section): Use is_strip_section.
-        (copy_section): Use is_strip_section.
-        (copy_main): Handle OPTION_ADD_GNU_DEBUGLINK.
+	(OPTION_ADD_GNU_DEBUGLINK): New switch
+	(copy_options): Describe --add-gnu-debuglink switch.
+	Mention that --strip-debug removes sections as well.
+	(is_strip_section): Process the sections removed and kept
+	lists before checking for debugging sections.
+	(add_redefine_syms_file): Make function static.
+	(copy_object): Use is_strip_section.
+	Check to see if a .gnu_debuglink section should be added.  If
+	so, call bfd_add_gnu_debuglink.
+	(setup_section): Use is_strip_section.
+	(copy_section): Use is_strip_section.
+	(copy_main): Handle OPTION_ADD_GNU_DEBUGLINK.
 	* NEWS: Mention new objcopy switch.
-        * doc/binutils.texi: Document new switch.
+	* doc/binutils.texi: Document new switch.
 
 2003-06-11  H.J. Lu <hongjiu.lu@intel.com>
 
@@ -554,9 +562,9 @@
 
 	* NEWS: Document the new BSD/POSIX single-character mapping for
 	.comment/.note sections.
-	
+
 2003-06-02  Chris Demetriou  <cgd@broadcom.com>
-            Jason Thorpe  <thorpej@wasabisystems.com>
+	    Jason Thorpe  <thorpej@wasabisystems.com>
 
 	* objcopy.c (redefine_list_append): Add an argument that
 	indicates the context from which this function is being
@@ -629,7 +637,7 @@
 
 2003-04-24  Dimitrie O. Paun <dpaun@rogers.com>
 
-        * doc/binutils.texi: Fix the documentation for the -fo option.
+	* doc/binutils.texi: Fix the documentation for the -fo option.
 
 2003-04-23  J"orn Rennecke <joern.rennecke@superh.com>
 
@@ -639,7 +647,7 @@
 	* readelf.c (decode_location_expression): Don't add a trailing ';'.
 
 2003-04-23  Dimitrie O. Paun <dpaun@rogers.com>
-            Nick Clifton  <nickc@redhat.com>
+	    Nick Clifton  <nickc@redhat.com>
 
 	* windres.c (long_options): Move close to main, where it is used.
 	Add 'input' and 'output' long options.
@@ -777,7 +785,7 @@
 	* bucomm.c: Include bfdver.h and libbfd.h
 	(display_target_list): Call bfd_nonfatal instead of nonfatal and
 	return 0 on a non-fatal error, 1 on success.
-	(display_info_table): Likewise.	
+	(display_info_table): Likewise.
 	* bucomm.h (display_info): Provide a prototype.
 	* Makefile.am (bucomm.o): Add dependencies on bfdver.h and
 	libbfd.h.
@@ -799,7 +807,7 @@
 	the symbol's value when --size-sort is used, unless -S is used.
 	doc/binutils.texi (--size-sort): For non-bsd formats both the
 	value and size of the symbols are displayed.
-	
+
 2003-03-13  Nick Clifton  <nickc@redhat.com>
 
 	* po/da.po: Update.
@@ -825,7 +833,7 @@
 2003-03-04  Elias Athanasopoulos  <elathan@phys.uoa.gr>
 
 	* nm.c (print_symbol): Remove check for undefined_only.
-	
+
 2003-03-03  Nick Clifton  <nickc@redhat.com>
 
 	* po/da.po: Installed latest translation.
diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index 2a07cc5..324c0ea 100644
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -350,7 +350,7 @@ install-exec-local: install-binPROGRAMS $(bin_PROGRAMS) $(noinst_PROGRAMS)
 	  if [ -f $$i$(EXEEXT) ]; then \
 	    j=`echo $$i | sed -e 's/-new//'`; \
 	    k=`echo $$j | sed '$(transform)'`; \
-	    if [ "$(DESTDIR)$(bindir)/$$k$(EXEEXT)" != "$(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT)" ]; then \
+	    if [ "$(bindir)/$$k" != "$(tooldir)/bin/$$j" ]; then \
 	      rm -f $(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT); \
 	      ln $(DESTDIR)$(bindir)/$$k$(EXEEXT) $(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT) >/dev/null 2>/dev/null \
 		|| $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXEEXT) $(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT); \
diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 23aa0ba..46eeac8 100644
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -442,7 +442,7 @@ configure.in deflex.c defparse.c nlmheader.c rclex.c rcparse.c
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 SOURCES = $(nlmconv_SOURCES) $(srconv_SOURCES) $(sysdump_SOURCES) $(coffdump_SOURCES) $(dlltool_SOURCES) $(windres_SOURCES) $(dllwrap_SOURCES) $(size_SOURCES) $(objdump_SOURCES) $(ar_SOURCES) $(strings_SOURCES) $(ranlib_SOURCES) $(objcopy_SOURCES) $(addr2line_SOURCES) $(readelf_SOURCES) $(nm_new_SOURCES) $(strip_new_SOURCES) $(cxxfilt_SOURCES)
 OBJECTS = $(nlmconv_OBJECTS) $(srconv_OBJECTS) $(sysdump_OBJECTS) $(coffdump_OBJECTS) $(dlltool_OBJECTS) $(windres_OBJECTS) $(dllwrap_OBJECTS) $(size_OBJECTS) $(objdump_OBJECTS) $(ar_OBJECTS) $(strings_OBJECTS) $(ranlib_OBJECTS) $(objcopy_OBJECTS) $(addr2line_OBJECTS) $(readelf_OBJECTS) $(nm_new_OBJECTS) $(strip_new_OBJECTS) $(cxxfilt_OBJECTS)
@@ -870,7 +870,7 @@ distclean-generic:
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
-	-test -z "arlexldeflexlrclexlarparseharparsecdefparsehdefparsecnlmheaderhnlmheadercrcparsehrcparsec" || rm -f arlexl deflexl rclexl arparseh arparsec defparseh defparsec nlmheaderh nlmheaderc rcparseh rcparsec
+	-test -z "arlex.cdeflex.crclex.carparse.harparse.cdefparse.hdefparse.cnlmheader.hnlmheader.crcparse.hrcparse.c" || rm -f arlex.c deflex.c rclex.c arparse.h arparse.c defparse.h defparse.c nlmheader.h nlmheader.c rcparse.h rcparse.c
 mostlyclean-am:  mostlyclean-hdr mostlyclean-binPROGRAMS \
 		mostlyclean-noinstPROGRAMS mostlyclean-compile \
 		mostlyclean-libtool mostlyclean-tags \
@@ -1078,7 +1078,7 @@ install-exec-local: install-binPROGRAMS $(bin_PROGRAMS) $(noinst_PROGRAMS)
 	  if [ -f $$i$(EXEEXT) ]; then \
 	    j=`echo $$i | sed -e 's/-new//'`; \
 	    k=`echo $$j | sed '$(transform)'`; \
-	    if [ "$(DESTDIR)$(bindir)/$$k$(EXEEXT)" != "$(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT)" ]; then \
+	    if [ "$(bindir)/$$k" != "$(tooldir)/bin/$$j" ]; then \
 	      rm -f $(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT); \
 	      ln $(DESTDIR)$(bindir)/$$k$(EXEEXT) $(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT) >/dev/null 2>/dev/null \
 		|| $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXEEXT) $(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT); \
diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am
index 9db5819..851f205 100644
--- a/binutils/doc/Makefile.am
+++ b/binutils/doc/Makefile.am
@@ -45,98 +45,98 @@ binutils.info: $(binutils_TEXI) config.texi
 # Man page generation from texinfo
 addr2line.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Daddr2line < $< > addr2line.pod
+	-$(TEXI2POD) $(MANCONF) -Daddr2line < $(binutils_TEXI) > addr2line.pod
 	-($(POD2MAN) addr2line.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f addr2line.pod
 
 ar.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Dar < $< > ar.pod
+	-$(TEXI2POD) $(MANCONF) -Dar < $(binutils_TEXI) > ar.pod
 	-($(POD2MAN) ar.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f ar.pod
 
 dlltool.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Ddlltool < $< > dlltool.pod
+	-$(TEXI2POD) $(MANCONF) -Ddlltool < $(binutils_TEXI) > dlltool.pod
 	-($(POD2MAN) dlltool.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f dlltool.pod
 
 nlmconv.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Dnlmconv < $< > nlmconv.pod
+	-$(TEXI2POD) $(MANCONF) -Dnlmconv < $(binutils_TEXI) > nlmconv.pod
 	-($(POD2MAN) nlmconv.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f nlmconv.pod
 
 nm.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Dnm < $< > nm.pod
+	-$(TEXI2POD) $(MANCONF) -Dnm < $(binutils_TEXI) > nm.pod
 	-($(POD2MAN) nm.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f nm.pod
 
 objcopy.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Dobjcopy < $< > objcopy.pod
+	-$(TEXI2POD) $(MANCONF) -Dobjcopy < $(binutils_TEXI) > objcopy.pod
 	-($(POD2MAN) objcopy.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f objcopy.pod
 
 objdump.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Dobjdump < $< > objdump.pod
+	-$(TEXI2POD) $(MANCONF) -Dobjdump < $(binutils_TEXI) > objdump.pod
 	-($(POD2MAN) objdump.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f objdump.pod
 
 ranlib.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Dranlib < $< > ranlib.pod
+	-$(TEXI2POD) $(MANCONF) -Dranlib < $(binutils_TEXI) > ranlib.pod
 	-($(POD2MAN) ranlib.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f ranlib.pod
 
 readelf.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Dreadelf < $< > readelf.pod
+	-$(TEXI2POD) $(MANCONF) -Dreadelf < $(binutils_TEXI) > readelf.pod
 	-($(POD2MAN) readelf.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f readelf.pod
 
 size.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Dsize < $< > size.pod
+	-$(TEXI2POD) $(MANCONF) -Dsize < $(binutils_TEXI) > size.pod
 	-($(POD2MAN) size.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f size.pod
 
 strings.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Dstrings < $< > strings.pod
+	-$(TEXI2POD) $(MANCONF) -Dstrings < $(binutils_TEXI) > strings.pod
 	-($(POD2MAN) strings.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f strings.pod
 
 strip.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Dstrip < $< > strip.pod
+	-$(TEXI2POD) $(MANCONF) -Dstrip < $(binutils_TEXI) > strip.pod
 	-($(POD2MAN) strip.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f strip.pod
 
 windres.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Dwindres < $< > windres.pod
+	-$(TEXI2POD) $(MANCONF) -Dwindres < $(binutils_TEXI) > windres.pod
 	-($(POD2MAN) windres.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f windres.pod
 
 cxxfilt.man:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Dcxxfilt < $< > $(DEMANGLER_NAME).pod
+	-$(TEXI2POD) $(MANCONF) -Dcxxfilt < $(binutils_TEXI) > $(DEMANGLER_NAME).pod
 	-($(POD2MAN) $(DEMANGLER_NAME).pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f $(DEMANGLER_NAME).pod
diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in
index f80a917..e05f5be 100644
--- a/binutils/doc/Makefile.in
+++ b/binutils/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -178,7 +178,7 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
@@ -444,98 +444,98 @@ binutils.info: $(binutils_TEXI) config.texi
 # Man page generation from texinfo
 addr2line.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Daddr2line < $< > addr2line.pod
+	-$(TEXI2POD) $(MANCONF) -Daddr2line < $(binutils_TEXI) > addr2line.pod
 	-($(POD2MAN) addr2line.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f addr2line.pod
 
 ar.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Dar < $< > ar.pod
+	-$(TEXI2POD) $(MANCONF) -Dar < $(binutils_TEXI) > ar.pod
 	-($(POD2MAN) ar.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f ar.pod
 
 dlltool.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Ddlltool < $< > dlltool.pod
+	-$(TEXI2POD) $(MANCONF) -Ddlltool < $(binutils_TEXI) > dlltool.pod
 	-($(POD2MAN) dlltool.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f dlltool.pod
 
 nlmconv.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Dnlmconv < $< > nlmconv.pod
+	-$(TEXI2POD) $(MANCONF) -Dnlmconv < $(binutils_TEXI) > nlmconv.pod
 	-($(POD2MAN) nlmconv.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f nlmconv.pod
 
 nm.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Dnm < $< > nm.pod
+	-$(TEXI2POD) $(MANCONF) -Dnm < $(binutils_TEXI) > nm.pod
 	-($(POD2MAN) nm.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f nm.pod
 
 objcopy.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Dobjcopy < $< > objcopy.pod
+	-$(TEXI2POD) $(MANCONF) -Dobjcopy < $(binutils_TEXI) > objcopy.pod
 	-($(POD2MAN) objcopy.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f objcopy.pod
 
 objdump.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Dobjdump < $< > objdump.pod
+	-$(TEXI2POD) $(MANCONF) -Dobjdump < $(binutils_TEXI) > objdump.pod
 	-($(POD2MAN) objdump.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f objdump.pod
 
 ranlib.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Dranlib < $< > ranlib.pod
+	-$(TEXI2POD) $(MANCONF) -Dranlib < $(binutils_TEXI) > ranlib.pod
 	-($(POD2MAN) ranlib.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f ranlib.pod
 
 readelf.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Dreadelf < $< > readelf.pod
+	-$(TEXI2POD) $(MANCONF) -Dreadelf < $(binutils_TEXI) > readelf.pod
 	-($(POD2MAN) readelf.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f readelf.pod
 
 size.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Dsize < $< > size.pod
+	-$(TEXI2POD) $(MANCONF) -Dsize < $(binutils_TEXI) > size.pod
 	-($(POD2MAN) size.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f size.pod
 
 strings.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Dstrings < $< > strings.pod
+	-$(TEXI2POD) $(MANCONF) -Dstrings < $(binutils_TEXI) > strings.pod
 	-($(POD2MAN) strings.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f strings.pod
 
 strip.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Dstrip < $< > strip.pod
+	-$(TEXI2POD) $(MANCONF) -Dstrip < $(binutils_TEXI) > strip.pod
 	-($(POD2MAN) strip.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f strip.pod
 
 windres.1:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Dwindres < $< > windres.pod
+	-$(TEXI2POD) $(MANCONF) -Dwindres < $(binutils_TEXI) > windres.pod
 	-($(POD2MAN) windres.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f windres.pod
 
 cxxfilt.man:	$(binutils_TEXI)
 	touch $@
-	-$(TEXI2POD) $(MANCONF) -Dcxxfilt < $< > $(DEMANGLER_NAME).pod
+	-$(TEXI2POD) $(MANCONF) -Dcxxfilt < $(binutils_TEXI) > $(DEMANGLER_NAME).pod
 	-($(POD2MAN) $(DEMANGLER_NAME).pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
 		mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
 	rm -f $(DEMANGLER_NAME).pod