* Makefile.in (taz): Get the version number from AM_INIT_AUTOMAKE in

	configure.in if it is present.

diff --git a/ChangeLog b/ChangeLog
index b040e7b9ff312188d26caf65699b6ab2658507a4..783e2ec2669fc211dda72fb0b67770ce9e3e04f1 100644 (file)
--- 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 23b117a438038c1d160074fb5e4b8963db99a13d..bee5a4aafa219a935c040c86e2df93917ebde597 100644 (file)
--- 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"