aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>1997-08-10 18:41:42 +0000
committerIan Lance Taylor <ian@airs.com>1997-08-10 18:41:42 +0000
commit19ebe12304ede9a6489f2c4944fb5946c68e5b83 (patch)
treecbf9a531d2576893a881940cffe8eb5f79f2126d
parentabb742acbaf7e4253eecb42152a2ca0f8132c963 (diff)
downloadgdb-19ebe12304ede9a6489f2c4944fb5946c68e5b83.zip
gdb-19ebe12304ede9a6489f2c4944fb5946c68e5b83.tar.gz
gdb-19ebe12304ede9a6489f2c4944fb5946c68e5b83.tar.bz2
* Makefile.in (taz): Get the version number from AM_INIT_AUTOMAKE in
configure.in if it is present.
-rw-r--r--ChangeLog9
-rw-r--r--Makefile.in12
2 files changed, 17 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b040e7b..783e2ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sun Aug 10 14:41:11 1997 Ian Lance Taylor <ian@cygnus.com>
+
+ * Makefile.in (taz): Get the version number from AM_INIT_AUTOMAKE in
+ configure.in if it is present.
+
+Sat Aug 9 00:58:01 1997 Ian Lance Taylor <ian@cygnus.com>
+
+ * Makefile.in (LD_FOR_TARGET): Change ld.new to ld-new.
+
Fri Aug 8 16:30:13 1997 Doug Evans <dje@canuck.cygnus.com>
* config.sub: Recognize `arc' cpu.
diff --git a/Makefile.in b/Makefile.in
index 23b117a..bee5a4a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -248,8 +248,8 @@ AS_FOR_TARGET = ` \
fi`
LD_FOR_TARGET = ` \
- if [ -f $$r/ld/ld.new ] ; then \
- echo $$r/ld/ld.new ; \
+ if [ -f $$r/ld/ld-new ] ; then \
+ echo $$r/ld/ld-new ; \
else \
if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
echo $(LD); \
@@ -1588,8 +1588,12 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \
ln -s ../../../texinfo/util/tex3patch proto-toplev/texinfo/util ; \
else true; fi
chmod og=u `find . -print`
- $(MAKE) -f Makefile.in do-tar-gz TOOL=$(TOOL) \
- VER=`sed <$(TOOL)/Makefile.in -n 's/^VERSION *= *//p'`
+ if grep AM_INIT_AUTOMAKE $(TOOL)/configure.in >/dev/null 2>&1; then \
+ ver=`sed < $(TOOL)/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'`; \
+ else \
+ ver=`sed <$(TOOL)/Makefile.in -n 's/^VERSION *= *//p'`; \
+ fi; \
+ $(MAKE) -f Makefile.in do-tar-gz TOOL=$(TOOL) VER=$$ver
do-tar-gz:
echo "==> Making $(TOOL)-$(VER).tar.gz"