diff options
| author | cvs2svn <> | 2001-06-19 13:17:40 +0400 |
|---|---|---|
| committer | cvs2svn <> | 2001-06-19 13:17:40 +0400 |
| commit | 62de504b0697f4c7b50dad02c902d87d7017b920 (patch) | |
| tree | 1ad5fda82e50b9c8f77a880f77cbc5c35a5e8d77 | |
| parent | f92f7f6a1289ce49ab0434d930ff55a919404fb5 (diff) | |
This commit was manufactured by cvs2svn to create tag 'binutils-2_11_2'.binutils-2_11_2
Sprout from binutils-2_11-branch 2001-06-18 01:09:09 UTC Alan Modra <modra@gmail.com> ' * Makefile.in (gas.tar.bz2): Pass TOOL=bfd PACKAGE=gas to make.'
Cherrypick from binutils-2_11-branch 2001-06-19 09:17:39 UTC Alan Modra <modra@gmail.com> ' * Makefile.in: Revert 2001-06-17.':
Makefile.in
| -rw-r--r-- | Makefile.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index a213fc077..d4ae7e9cd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1739,7 +1739,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'; \ else \ sed < $(TOOL)/Makefile.in -n 's/^VERSION *= *//p'; \ @@ -1868,7 +1870,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)" @@ -1876,14 +1878,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)" |