aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in10
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e5210e0..cf1c3d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-19 Alan Modra <amodra@bigpond.net.au>
+
+ * Makefile.in: Revert 2001-06-17.
+ (VER): If AM_INIT_AUTOMAKE uses BFD_VERSION, get version from bfd/.
+
2001-06-17 H.J. Lu <hjl@gnu.org>
* Makefile.in (gas.tar.bz2): Pass TOOL=bfd PACKAGE=gas to make.
diff --git a/Makefile.in b/Makefile.in
index 57d2775..ed3ab75 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1757,7 +1757,9 @@ SUPPORT_FILES = list-of-support-files-for-tool-in-question
# 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'; \
elif test -f $(TOOL)/version.in; then \
head -1 $(TOOL)/version.in; \
@@ -1890,7 +1892,7 @@ DIST_SUPPORT= $(DEVO_SUPPORT) $(TEXINFO_SUPPORT)
.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)"
@@ -1898,14 +1900,14 @@ gas.tar.bz2: $(DIST_SUPPORT) $(GAS_SUPPORT_DIRS) gas
.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)"