X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Makefile.in;h=ed3ab75548bbd43b5881045d61f16bb94d847a91;hb=496e6bc304fbe38632eb812b844e1e5c7a8263b3;hp=57d27755715f3fb2883c12d5daec1fbfab045f93;hpb=e09a66040ba6f6876e1912db0fc1dffd8a4e680a;p=binutils-gdb.git

diff --git a/Makefile.in b/Makefile.in
index 57d27755715..ed3ab75548b 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)"