diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 8ce3d5125d..7f410d323a 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-17  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* doc/Makefile.am (config.texi): Don't use $<.
+	* doc/Makefile.in: Regenerated.
+
 2005-05-15  Yitzchak Scott-Thoennes  <sthoenna@efn.org>
 
         * deflex.l: Ignore CRs
diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am
index 621f863842..edda4a0d9f 100644
--- a/binutils/doc/Makefile.am
+++ b/binutils/doc/Makefile.am
@@ -36,7 +36,8 @@ binutils_TEXI = $(srcdir)/binutils.texi
 
 config.texi: $(srcdir)/../../bfd/configure $(binutils_TEXI)
 	rm -f config.texi
-	eval `grep '^ *VERSION=' $<`; echo "@set VERSION $$VERSION" > $@
+	eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \
+	  echo "@set VERSION $$VERSION" > $@
 	echo "@set UPDATED `date "+%B %Y"`" >> config.texi
 
 # Man page generation from texinfo
diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in
index 38967613fe..03d945b0d3 100644
--- a/binutils/doc/Makefile.in
+++ b/binutils/doc/Makefile.in
@@ -567,7 +567,8 @@ uninstall-man: uninstall-man1
 
 config.texi: $(srcdir)/../../bfd/configure $(binutils_TEXI)
 	rm -f config.texi
-	eval `grep '^ *VERSION=' $<`; echo "@set VERSION $$VERSION" > $@
+	eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \
+	  echo "@set VERSION $$VERSION" > $@
 	echo "@set UPDATED `date "+%B %Y"`" >> config.texi
 
 # Man page generation from texinfo
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 12f0505ae8..ea056d4a76 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-17  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* doc/Makefile.am (gasver.texi): Don't use $<.
+	* doc/Makefile.in: Regenerated.
+
 2005-05-17  Nick Clifton  <nickc@redhat.com>
 
 	PR 876
diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am
index 9646ef8176..8b623d845e 100644
--- a/gas/doc/Makefile.am
+++ b/gas/doc/Makefile.am
@@ -60,7 +60,8 @@ CPU_DOCS = \
 
 gasver.texi: $(srcdir)/../../bfd/configure
 	rm -f $@
-	eval `grep '^ *VERSION=' $<`; echo "@set VERSION $$VERSION" > $@
+	eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \
+	  echo "@set VERSION $$VERSION" > $@
 
 $(srcdir)/as.info: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
 as.dvi: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in
index db9c95e819..f999e0841b 100644
--- a/gas/doc/Makefile.in
+++ b/gas/doc/Makefile.in
@@ -582,7 +582,8 @@ asconfig.texi: $(CONFIG).texi
 
 gasver.texi: $(srcdir)/../../bfd/configure
 	rm -f $@
-	eval `grep '^ *VERSION=' $<`; echo "@set VERSION $$VERSION" > $@
+	eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \
+	  echo "@set VERSION $$VERSION" > $@
 
 $(srcdir)/as.info: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
 as.dvi: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
diff --git a/ld/ChangeLog b/ld/ChangeLog
index d4b751b988..8021f9a495 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-17  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.am (ldver.texi): Don't use $<.
+	* Makefile.in: Regenerated.
+
 2005-05-17  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* Makefile.am (AM_MAKEINFOFLAGS, TEXI2DVI): Explicitly include
diff --git a/ld/Makefile.am b/ld/Makefile.am
index c4e4b50159..fec799dfb5 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -1635,7 +1635,8 @@ configdoc.texi:	${DOCVER}-doc.texi
 
 ldver.texi: $(srcdir)/../bfd/configure
 	rm -f $@
-	eval `grep '^ *VERSION=' $<`; echo "@set VERSION $$VERSION" > $@
+	eval `grep '^ *VERSION=' $(srcdir)/../bfd/configure`; \
+	  echo "@set VERSION $$VERSION" > $@
 
 $(srcdir)/ld.info: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
 ld.dvi: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
diff --git a/ld/Makefile.in b/ld/Makefile.in
index bb8e816efc..7b0b87f3a6 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -2428,7 +2428,8 @@ configdoc.texi:	${DOCVER}-doc.texi
 
 ldver.texi: $(srcdir)/../bfd/configure
 	rm -f $@
-	eval `grep '^ *VERSION=' $<`; echo "@set VERSION $$VERSION" > $@
+	eval `grep '^ *VERSION=' $(srcdir)/../bfd/configure`; \
+	  echo "@set VERSION $$VERSION" > $@
 
 $(srcdir)/ld.info: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
 ld.dvi: $(srcdir)/ld.texinfo configdoc.texi ldver.texi