* doc/Makefile.am (AM_MAKEINFOFLAGS, TEXI2DVI): Include

	$(top_srcdir)/../../bfd/doc.
	* doc/Makefile.in: Regenerate.

9 files changed, 30 insertions, 12 deletions

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index c07408c..5abb574 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-12  Matthias Klose  <doko@ubuntu.com>
+
+	* doc/Makefile.am (AM_MAKEINFOFLAGS, TEXI2DVI): Include
+	$(top_srcdir)/../../bfd/doc.
+	* doc/Makefile.in: Regenerate.
+
 2007-08-10  M R Swami Reddy <MR.Swami.Reddy@nsc.com>
 
 	* MAINTAINERS: Add myself as CR16 support maintainer and
diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am
index ceeda41..15953e0 100644
--- a/binutils/doc/Makefile.am
+++ b/binutils/doc/Makefile.am
@@ -35,9 +35,9 @@ info_TEXINFOS = binutils.texi
 binutils_TEXI = $(srcdir)/binutils.texi
 
 AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
-		   -I ../../bfd/doc
+		   -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc
 TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
-		    -I ../../bfd/doc
+		    -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc
 
 # Man page generation from texinfo
 addr2line.1:	$(binutils_TEXI) $(binutils_TEXINFOS)
diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in
index 338c9ba..d258024 100644
--- a/binutils/doc/Makefile.in
+++ b/binutils/doc/Makefile.in
@@ -256,10 +256,10 @@ man_MANS = \
 info_TEXINFOS = binutils.texi
 binutils_TEXI = $(srcdir)/binutils.texi
 AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
-		   -I ../../bfd/doc
+		   -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc
 
 TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
-		    -I ../../bfd/doc
+		    -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc
 
 MOSTLYCLEANFILES = $(DEMANGLER_NAME).1
 html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 0186ee3..7504cf4 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-12  Matthias Klose  <doko@ubuntu.com>
+
+	* doc/Makefile.am (AM_MAKEINFOFLAGS, TEXI2DVI): Include
+	$(top_srcdir)/../../bfd/doc.
+	* doc/Makefile.in: Regenerate.
+
 2007-08-10  Nick Clifton  <nickc@redhat.com>
 
 	* NEWS: Add a marker for the 2.18 features.
diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am
index 4f6ff92..621c03f 100644
--- a/gas/doc/Makefile.am
+++ b/gas/doc/Makefile.am
@@ -19,9 +19,9 @@ info_TEXINFOS = as.texinfo
 as_TEXINFOS = asconfig.texi $(CPU_DOCS)
 
 AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
-		   -I ../../bfd/doc
+		   -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc
 TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
-		   -I ../../bfd/doc
+		   -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc
 
 asconfig.texi: $(CONFIG).texi
 	rm -f asconfig.texi
diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in
index 86f3d7a..9b9102f 100644
--- a/gas/doc/Makefile.in
+++ b/gas/doc/Makefile.in
@@ -226,10 +226,10 @@ man_MANS = as.1
 info_TEXINFOS = as.texinfo 
 as_TEXINFOS = asconfig.texi $(CPU_DOCS)
 AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
-		   -I ../../bfd/doc
+		   -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc
 
 TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \
-		   -I ../../bfd/doc
+		   -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc
 
 CPU_DOCS = \
 	c-alpha.texi \
diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index 0b844cc..07c0f67 100644
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-12  Matthias Klose  <doko@ubuntu.com>
+
+	* Makefile.am (AM_MAKEINFOFLAGS, TEXI2DVI): Include
+	$(top_srcdir)/../../bfd/doc.
+	* Makefile.in: Regenerate.
+
 2007-08-12  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* configure.in (ALL_LINGUAS): Add fi.
diff --git a/gprof/Makefile.am b/gprof/Makefile.am
index edf4a8e..70c104b 100644
--- a/gprof/Makefile.am
+++ b/gprof/Makefile.am
@@ -65,8 +65,8 @@ info_TEXINFOS = gprof.texi
 gprof_TEXINFOS = config.texi
 man_MANS = gprof.1
 
-AM_MAKEINFOFLAGS = -I "$(srcdir)" -I ../bfd/doc
-TEXI2DVI = texi2dvi -I "$(srcdir)" -I ../bfd/doc
+AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../bfd/doc" -I ../bfd/doc
+TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../bfd/doc" -I ../bfd/doc
 
 config.texi:
 	echo "@set top_srcdir $(top_srcdir)" >> ./config.texi
diff --git a/gprof/Makefile.in b/gprof/Makefile.in
index d5c6925..062c117 100644
--- a/gprof/Makefile.in
+++ b/gprof/Makefile.in
@@ -272,8 +272,8 @@ POD2MAN = pod2man --center="GNU" --release="binutils-$(VERSION)" --section=1
 info_TEXINFOS = gprof.texi
 gprof_TEXINFOS = config.texi
 man_MANS = gprof.1
-AM_MAKEINFOFLAGS = -I "$(srcdir)" -I ../bfd/doc
-TEXI2DVI = texi2dvi -I "$(srcdir)" -I ../bfd/doc
+AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../bfd/doc" -I ../bfd/doc
+TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../bfd/doc" -I ../bfd/doc
 html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 CLEANFILES = dep.sed DEP DEPA DEP1 DEP2
 MAINTAINERCLEANFILES = gprof.info