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

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

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index c07408c67c095048febca86a36ed7bcaae8ad49d..5abb574cdc2b3ba4273e0ef2f0aaf1df2f13c195 100644 (file)
--- 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 ceeda41b004f6590406d29d1401eb5bf1496b483..15953e04dfedfc66630b8c943e725d30f1559268 100644 (file)
--- 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 338c9bad74eac5176e20a00fa2d6c4878be56ccc..d258024e5746d7fcdf9de708d5ec6661c6bbfe5a 100644 (file)
--- 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 0186ee321431d239b654cd274f48837a4537a192..7504cf4fc0446fa083419d8abc4c073debe7dbc6 100644 (file)
--- 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 4f6ff9294c087d4eb0b8b9fe9b3c368ddc74bdca..621c03f8cd32a7b61a29fd8f924e8e8306b63278 100644 (file)
--- 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 86f3d7a42693cd7de7800f4981fe4b24521bc48b..9b9102f236c0bde1ced3f0ec31e7a8dd59400906 100644 (file)
--- 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 0b844cc5f001c10c60bd9e8634fe60af001c4318..07c0f67fd069d8ad3d9d34e84785968449f2552a 100644 (file)
--- 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 edf4a8ebb603f444d14235c62641f9f37fcda495..70c104b873e55961ded8b1504665767765df6576 100644 (file)
--- 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 d5c69258e8989ccddbac5315391214e850e7bec5..062c1172dc6adea528a8968023e090fe683186b4 100644 (file)
--- 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