This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: Binutils 2.17 first prerelease available
On Mon, Apr 17, 2006 at 04:34:37PM +0200, Andreas Schwab wrote:
> Daniel Jacobowitz <drow@false.org> writes:
>
> > I have just uploaded:
> > ftp://sourceware.org/pub/binutils/snapshots/binutils-2.16.92.tar.bz2
> >
> > The binutils 2.17 branch is now open. Bug fixes only, please - use your
> > own discretion. Assuming that all goes well, there will be another
> > prerelease in a few weeks, which will shortly turn into a release.
>
> When touching binutils/doc/binutils.texi, I cannot rebuild the info file,
> because config.texi from the source directory is used instead of the one
> from the build directory.
I assume this is a recent development, because of the exact error:
> ../../../binutils/doc/binutils.texi:3528: @include `../.././binutils/../libiberty/at-file.texi': No such file or directory.
I don't know why we went through the hassle of using @include @value{}
for this, since we already use makeinfo -I in some cases.
[pause]
Oh, now I do. texi2pod.pl doesn't grok -I. Try this?
2006-04-17 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-17 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-04-17 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-17 Daniel Jacobowitz <dan@codesourcery.com>
* texi2pod.pl: Handle -I.
Index: binutils/Makefile.in
===================================================================
RCS file: /cvs/src/src/binutils/Makefile.in,v
retrieving revision 1.80
diff -u -p -r1.80 Makefile.in
--- binutils/Makefile.in 6 Apr 2006 21:49:26 -0000 1.80
+++ binutils/Makefile.in 17 Apr 2006 16:00:30 -0000
@@ -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@
Index: binutils/aclocal.m4
===================================================================
RCS file: /cvs/src/src/binutils/aclocal.m4,v
retrieving revision 1.17
diff -u -p -r1.17 aclocal.m4
--- binutils/aclocal.m4 30 Sep 2005 16:03:47 -0000 1.17
+++ binutils/aclocal.m4 17 Apr 2006 16:00:30 -0000
@@ -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
# 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 -*-
Index: binutils/doc/Makefile.am
===================================================================
RCS file: /cvs/src/src/binutils/doc/Makefile.am,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile.am
--- binutils/doc/Makefile.am 6 Apr 2006 21:49:29 -0000 1.11
+++ binutils/doc/Makefile.am 17 Apr 2006 16:00:30 -0000
@@ -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)
Index: binutils/doc/Makefile.in
===================================================================
RCS file: /cvs/src/src/binutils/doc/Makefile.in,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile.in
--- binutils/doc/Makefile.in 6 Apr 2006 21:49:29 -0000 1.23
+++ binutils/doc/Makefile.in 17 Apr 2006 16:00:30 -0000
@@ -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_T
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/configu
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)
Index: binutils/doc/binutils.texi
===================================================================
RCS file: /cvs/src/src/binutils/doc/binutils.texi,v
retrieving revision 1.90
diff -u -p -r1.90 binutils.texi
--- binutils/doc/binutils.texi 5 Apr 2006 16:12:01 -0000 1.90
+++ binutils/doc/binutils.texi 17 Apr 2006 16:00:31 -0000
@@ -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
Index: etc/texi2pod.pl
===================================================================
RCS file: /cvs/src/src/etc/texi2pod.pl,v
retrieving revision 1.4
diff -u -p -r1.4 texi2pod.pl
--- etc/texi2pod.pl 21 Oct 2005 23:29:22 -0000 1.4
+++ etc/texi2pod.pl 17 Apr 2006 16:00:32 -0000
@@ -36,6 +36,7 @@ $shift = "";
$fnno = 1;
$inf = "";
$ibase = "";
+@ipath = ();
while ($_ = shift) {
if (/^-D(.*)$/) {
@@ -51,6 +52,13 @@ while ($_ = shift) {
die "flags may only contain letters, digits, hyphens, dashes and underscores\n"
unless $flag =~ /^[a-zA-Z0-9_-]+$/;
$defs{$flag} = $value;
+ } elsif (/^-I(.*)$/) {
+ if ($1 ne "") {
+ $flag = $1;
+ } else {
+ $flag = shift;
+ }
+ push (@ipath, $flag);
} elsif (/^-/) {
usage();
} else {
@@ -229,10 +237,12 @@ while(<$inf>) {
$inf = gensym();
$file = postprocess($1);
- # Try cwd and $ibase.
- open($inf, "<" . $file)
- or open($inf, "<" . $ibase . "/" . $file)
- or die "cannot open $file or $ibase/$file: $!\n";
+ # Try cwd and $ibase, then explicit -I paths.
+ $done = 0;
+ foreach $path (".", $ibase, @ipath) {
+ open($inf, "<" . $path . "/" . $file) and ($done = 1, last);
+ }
+ die "cannot find $file" if !$done;
next;
};
Index: gas/Makefile.in
===================================================================
RCS file: /cvs/src/src/gas/Makefile.in,v
retrieving revision 1.142
diff -u -p -r1.142 Makefile.in
--- gas/Makefile.in 6 Apr 2006 21:49:31 -0000 1.142
+++ gas/Makefile.in 17 Apr 2006 16:00:32 -0000
@@ -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@
Index: gas/aclocal.m4
===================================================================
RCS file: /cvs/src/src/gas/aclocal.m4,v
retrieving revision 1.27
diff -u -p -r1.27 aclocal.m4
--- gas/aclocal.m4 30 Sep 2005 18:55:22 -0000 1.27
+++ gas/aclocal.m4 17 Apr 2006 16:00:32 -0000
@@ -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
# 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 -*-
Index: gas/doc/Makefile.am
===================================================================
RCS file: /cvs/src/src/gas/doc/Makefile.am,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile.am
--- gas/doc/Makefile.am 6 Apr 2006 21:49:33 -0000 1.43
+++ gas/doc/Makefile.am 17 Apr 2006 16:00:32 -0000
@@ -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 \
Index: gas/doc/Makefile.in
===================================================================
RCS file: /cvs/src/src/gas/doc/Makefile.in,v
retrieving revision 1.76
diff -u -p -r1.76 Makefile.in
--- gas/doc/Makefile.in 6 Apr 2006 21:49:33 -0000 1.76
+++ gas/doc/Makefile.in 17 Apr 2006 16:00:32 -0000
@@ -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 $@
Index: gas/doc/as.texinfo
===================================================================
RCS file: /cvs/src/src/gas/doc/as.texinfo,v
retrieving revision 1.141
diff -u -p -r1.141 as.texinfo
--- gas/doc/as.texinfo 17 Mar 2006 00:45:13 -0000 1.141
+++ gas/doc/as.texinfo 17 Apr 2006 16:00:36 -0000
@@ -451,7 +451,7 @@ gcc(1), ld(1), and the Info entries for
@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:
Index: ld/Makefile.am
===================================================================
RCS file: /cvs/src/src/ld/Makefile.am,v
retrieving revision 1.209
diff -u -p -r1.209 Makefile.am
--- ld/Makefile.am 11 Apr 2006 10:36:26 -0000 1.209
+++ ld/Makefile.am 17 Apr 2006 16:00:37 -0000
@@ -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 $@
Index: ld/Makefile.in
===================================================================
RCS file: /cvs/src/src/ld/Makefile.in,v
retrieving revision 1.223
diff -u -p -r1.223 Makefile.in
--- ld/Makefile.in 11 Apr 2006 10:36:26 -0000 1.223
+++ ld/Makefile.in 17 Apr 2006 16:00:37 -0000
@@ -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 $@
Index: ld/aclocal.m4
===================================================================
RCS file: /cvs/src/src/ld/aclocal.m4,v
retrieving revision 1.14
diff -u -p -r1.14 aclocal.m4
--- ld/aclocal.m4 30 Sep 2005 18:59:46 -0000 1.14
+++ ld/aclocal.m4 17 Apr 2006 16:00:37 -0000
@@ -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
# 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 -*-
Index: ld/ld.texinfo
===================================================================
RCS file: /cvs/src/src/ld/ld.texinfo,v
retrieving revision 1.159
diff -u -p -r1.159 ld.texinfo
--- ld/ld.texinfo 7 Apr 2006 14:14:46 -0000 1.159
+++ ld/ld.texinfo 17 Apr 2006 16:00:39 -0000
@@ -342,7 +342,7 @@ Here is a table of the generic command l
linker:
@table @gcctabopt
-@include @value{top_srcdir}/../libiberty/at-file.texi
+@include at-file.texi
@kindex -a@var{keyword}
@item -a@var{keyword}
--
Daniel Jacobowitz
CodeSourcery