This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
Re: 2.11.1
Sorry for the release snafu. This should fix it.
ChangeLog
* Makefile.in: Revert 2001-06-17.
(VER): If AM_INIT_AUTOMAKE uses BFD_VERSION, get version from bfd/.
Applying to mainline as well as 2.11 branch.
--
Alan Modra
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/Makefile.in,v
retrieving revision 1.29.2.1
diff -u -p -r1.29.2.1 Makefile.in
--- Makefile.in 2001/06/18 01:09:09 1.29.2.1
+++ Makefile.in 2001/06/19 09:12:42
@@ -1739,7 +1739,9 @@ SUPPORT_FILES = list-of-support-files-fo
# NOTE: No double quotes in the below. It is used within shell script
# as VER="$(VER)"
-VER = ` if grep AM_INIT_AUTOMAKE $(TOOL)/configure.in >/dev/null 2>&1; then \
+VER = ` if grep 'AM_INIT_AUTOMAKE.*BFD_VERSION' $(TOOL)/configure.in >/dev/null 2>&1; then \
+ sed < bfd/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \
+ elif grep AM_INIT_AUTOMAKE $(TOOL)/configure.in >/dev/null 2>&1; then \
sed < $(TOOL)/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \
else \
sed < $(TOOL)/Makefile.in -n 's/^VERSION *= *//p'; \
@@ -1868,7 +1870,7 @@ DIST_SUPPORT= $(DEVO_SUPPORT) $(TEXINFO_
.PHONY: gas.tar.bz2
GAS_SUPPORT_DIRS= bfd include libiberty opcodes intl setup.com makefile.vms mkdep
gas.tar.bz2: $(DIST_SUPPORT) $(GAS_SUPPORT_DIRS) gas
- $(MAKE) -f Makefile.in taz TOOL=bfd PACKAGE=gas \
+ $(MAKE) -f Makefile.in taz TOOL=gas \
MD5PROG="$(MD5PROG)" \
SUPPORT_FILES="$(GAS_SUPPORT_DIRS)"
@@ -1876,14 +1878,14 @@ gas.tar.bz2: $(DIST_SUPPORT) $(GAS_SUPPO
.PHONY: binutils.tar.bz2
BINUTILS_SUPPORT_DIRS= bfd gas include libiberty opcodes ld gprof intl setup.com makefile.vms mkdep
binutils.tar.bz2: $(DIST_SUPPORT) $(BINUTILS_SUPPORT_DIRS) binutils
- $(MAKE) -f Makefile.in taz TOOL=bfd PACKAGE=binutils \
+ $(MAKE) -f Makefile.in taz TOOL=binutils \
MD5PROG="$(MD5PROG)" \
SUPPORT_FILES="$(BINUTILS_SUPPORT_DIRS)"
.PHONY: gas+binutils.tar.bz2
GASB_SUPPORT_DIRS= $(GAS_SUPPORT_DIRS) binutils ld gprof
gas+binutils.tar.bz2: $(DIST_SUPPORT) $(GASB_SUPPORT_DIRS) gas
- $(MAKE) -f Makefile.in taz TOOL=bfd PACKAGE=gas \
+ $(MAKE) -f Makefile.in taz TOOL=gas \
MD5PROG="$(MD5PROG)" \
SUPPORT_FILES="$(GASB_SUPPORT_DIRS)"