* automake.in (handle_dist): Use AMTAR.

	(initialize_global_constants): Likewise.
	* m4/init.m4 (AM_INIT_AUTOMAKE): Use AMTAR, not TAR.

diff --git a/ChangeLog b/ChangeLog
index e0eefa42bee48aaa04af58c0911300a89d249ee5..2321fc9295732574ac6db4a5cb9342f3dc3be249 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-04-11  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (handle_dist): Use AMTAR.
+       (initialize_global_constants): Likewise.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Use AMTAR, not TAR.
+
        * automake.in (lang_sub_obj): New function.
        (lang_cxx_rewrite): Use it.
        (lang_asm_rewrite): Likewise.

diff --git a/automake.in b/automake.in
index 4c4900db6ae5c000e52eed23212110d5f7997b0a..a047d67e8de74651617667f35bebf8655cd52fe7 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2672,7 +2672,7 @@ sub handle_dist
 # tarfile.
 distcheck: dist
        -rm -rf $(distdir)
-       GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(TAR) xf -
+       GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
        mkdir $(distdir)/=build
        mkdir $(distdir)/=inst
        dc_install_base=`cd $(distdir)/=inst && pwd`; \\'
@@ -6619,17 +6619,17 @@ sub initialize_global_constants
     # if we chmod a symlink.
     $dist_header = "\t" . '-chmod -R a+r $(distdir)' . "\n";
     $dist{'dist-bzip2'} = ("\t"
-                          . '$(TAR) ch$(AMTARFLAGS)f - $(distdir) | bzip --best -c > $(distdir).bz2'
+                          . '$(AMTAR) ch$(AMTARFLAGS)f - $(distdir) | bzip --best -c > $(distdir).bz2'
                           . "\n");
     $dist{'dist-tarZ'} = ("\t"
-                    . '$(TAR) ch$(AMTARFLAGS)f - $(distdir) | compress -c > $(distdir).tar.Z'
+                    . '$(AMTAR) ch$(AMTARFLAGS)f - $(distdir) | compress -c > $(distdir).tar.Z'
                     . "\n");
     $dist{'dist-shar'} = ("\t"
                     . 'shar $(distdir) | gzip > $(distdir).shar.gz'
                     . "\n");
     $dist{'dist-zip'} = "\t" . 'zip -rq $(distdir).zip $(distdir)' . "\n";
     $dist{'dist'} = ("\t"
-                    .  '$(TAR) ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz'
+                    .  '$(AMTAR) ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz'
                     . "\n");
     $dist_trailer = "\t" . '-rm -rf $(distdir)' . "\n";
 }

diff --git a/m4/init.m4 b/m4/init.m4
index 45b621747f0e029816683e38462f15685b15bb8f..ff0b2e04e58dc5aa28ed6d7ca4fd6b261f7621e2 100644 (file)
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -35,10 +35,10 @@ dnl We check for tar when the user configures the end package.
 dnl This is sad, since we only need this for "dist".  However,
 dnl there's no other good way to do it.  We prefer GNU tar if
 dnl we can find it.  If we can't find a tar, it doesn't really matter.
-AC_CHECK_PROGS(TAR, gnutar gtar tar)
+AC_CHECK_PROGS(AMTAR, gnutar gtar tar)
 AMTARFLAGS=
-if test -n "$TAR"; then
-  if $SHELL -c "$TAR --version" > /dev/null 2>&1; then
+if test -n "$AMTAR"; then
+  if $SHELL -c "$AMTAR --version" > /dev/null 2>&1; then
     dnl We have GNU tar.
     AMTARFLAGS=o
   fi