many fixes

29 files changed, 110 insertions, 47 deletions

diff --git a/ChangeLog b/ChangeLog
index cf6286df2..639bae27a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
+Fri Feb 21 00:39:17 1997  Tom Tromey  <tromey@cygnus.com>
+
+	* ltlibs.am, lisp.am, libs.am, header.am, data.am, progs.am,
+	scripts.am, texinfos.am: Add leading space to echo.
+
+	* automake.in (handle_texinfo): Added .tps and .vrs to list of TeX
+	endings.  From Jim Blandy.
+	(install_man_format): Make rule silent; instead print actual
+	command.
+
 Tue Feb  4 18:29:42 1997  Tom Tromey  <tromey@cygnus.com>
 
+	* dist-vars.am (TAR): Removed.
+	* automake.in (TAR): New variable.
+	(handle_dist): Explicitly define TAR.
+	* configure.in: Compute TAR.
+
 	* automake.in (handle_lib_objects): Put @ALLOCA@ on @dep_list, not
 	@dep_files.
 	(AC_SUBST_PATTERN): Typo fix.
diff --git a/Makefile.in b/Makefile.in
index a778c488d..d7d27ffd9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -40,6 +40,7 @@ transform = @program_transform_name@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
+TAR = @TAR@
 VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = gnits
@@ -89,8 +90,6 @@ stamp-vti texinfo.tex version.texi ylwrap
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \
 	$(TEXINFOS) $(MANS) $(EXTRA_DIST)
-
-TAR = tar
 default: all
 
 .SUFFIXES:
@@ -424,14 +423,14 @@ maintainer-clean-am:  maintainer-clean-vti maintainer-clean-info \
 		maintainer-clean-tags maintainer-clean-generic \
 		distclean-am
 
-mostlyclean:  mostlyclean-am mostlyclean-recursive
+mostlyclean:  mostlyclean-recursive mostlyclean-am
 
-clean:  clean-am clean-recursive
+clean:  clean-recursive clean-am
 
-distclean:  distclean-am distclean-recursive
+distclean:  distclean-recursive distclean-am
 	rm -f config.status
 
-maintainer-clean:  maintainer-clean-am maintainer-clean-recursive
+maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 	rm -f config.status
diff --git a/THANKS b/THANKS
index f1204e4a8..e997e08c8 100644
--- a/THANKS
+++ b/THANKS
@@ -2,6 +2,7 @@ Automake was originally written by David J. MacKenzie <djm@uunet.uu.net>.
 It would not be what it is today without the invaluable help of these
 people:
 
+"Garrett D'Amore" <garrett@qualcomm.com>
 Andreas Schwab <schwab@lamothe.informatik.uni-dortmund.de>
 Anthony Green <green@cygnus.com>
 David A. Swierczek <swiercze@mr.med.ge.com>
@@ -26,6 +27,7 @@ Karl Berry <kb@cs.umb.edu>
 Marius Vollmer <mvo@zagadka.ping.de>
 Mark Galassi <rosalia@nis.lanl.gov>
 Markku Rossi <mtr@ngs.fi>
+Michael Brantley <Michael-Brantley@deshaw.com>
 Noah Friedman <friedman@gnu.ai.mit.edu>
 Nyul Laszlo <nyul@sol.cc.u-szeged.hu>
 Per Bothner <bothner@cygnus.com>
diff --git a/TODO b/TODO
index 8589b59a6..8330f1037 100644
--- a/TODO
+++ b/TODO
@@ -2,6 +2,8 @@ Priorities for release:
 !! documentation (eg new macros)
 * copyrights on m4 files, aclocal output
 
+* must understand -Ifoo in ACLOCAL_AMFLAGS
+
 * should not put texiname_TEXINFOS into distribution
   should rename this macro anyway, to foo_texi_DEPENDENCIES
 
diff --git a/automake.in b/automake.in
index 7e3b3e538..2f84a0b31 100755
--- a/automake.in
+++ b/automake.in
@@ -33,6 +33,7 @@ $VERSION = "@VERSION@";
 $PACKAGE = "@PACKAGE@";
 $prefix = "@prefix@";
 $am_dir = "@datadir@/@PACKAGE@";
+$TAR = "@TAR@";
 
 # String constants.
 $IGNORE_PATTERN = "^##([^#].*)?\$";
@@ -1597,7 +1598,8 @@ sub handle_texinfo
 	# removed.  In particular the ".log" extension might
 	# reasonably be used in other contexts by the user.
 	foreach $tc_cursor ('aux', 'cp', 'cps', 'dvi', 'fn', 'fns',
-			    'ky', 'log', 'pg', 'toc', 'tp', 'vr', 'op')
+			    'ky', 'log', 'pg', 'toc', 'tp', 'tps',
+			    'vr', 'vrs', 'op')
 	{
 	    push (@texi_cleans, $infobase . '.' . $tc_cursor);
 	}
@@ -1979,7 +1981,7 @@ sub handle_dist
     $output_vars .= "\n";
 
     # Some boilerplate.
-    $output_vars .= &file_contents ('dist-vars');
+    $output_vars .= &file_contents ('dist-vars') . "\nTAR = " . $TAR . "\n";
 
     # Put these things in rules section so it is easier for whoever
     # reads Makefile.in.
@@ -4001,10 +4003,11 @@ sub initialize_global_constants
 
     # Helper text for dealing with man pages.
     $install_man_format =
-    '	sect=@SECTION@;				\\
+    '	@sect=@SECTION@;				\\
 	inst=`echo "@MANBASE@" | sed \'$(transform)\'`.@FULLSECT@; \\
 	if test -f $(srcdir)/@MAN@; then file=$(srcdir)/@MAN@; \\
 	else file=@MAN@; fi; \\
+	echo " $(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst"; \\
 	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
 ';
 
diff --git a/automake.texi b/automake.texi
index 51af59b23..c1e513909 100644
--- a/automake.texi
+++ b/automake.texi
@@ -630,10 +630,13 @@ This is similar to @code{AC_CANONICAL_HOST}, but also defines the
 @item AC_REPLACE_FUNCS
 @item AC_REPLACE_GNU_GETOPT
 @item AM_WITH_REGEX
-Automake will ensure that the appropriate source files are part of the
-distribution, and will ensure that the appropriate dependencies are
-generated for these objects.  @xref{A Library} for more
-information.
+Automake will ensure that the appropriate dependencies are generated for
+the objects corresponding to these macros.  Also, Automake will verify
+that the appropriate source files are part of the distribution.  Note
+that Automake does not come with any of the C sources required to use
+these macros, so @code{automake -a} will not install the sources.
+@xref{A Library} for more information.
+
 @cvindex AC_FUNC_ALLOCA
 @cvindex AC_FUNC_GETLOADAVG
 @cvindex AC_FUNC_MEMCMP
diff --git a/configure b/configure
index f7336d180..ca60a72bf 100755
--- a/configure
+++ b/configure
@@ -676,10 +676,45 @@ else
 fi
 
 
+# Find an appropriate tar for use in "dist" targets.  A "best guess"
+# is good enough -- if we can't find GNU tar, we don't really care.
+for ac_prog in gnutar gtar tar
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:687: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$TAR"; then
+  ac_cv_prog_TAR="$TAR" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_TAR="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+TAR="$ac_cv_prog_TAR"
+if test -n "$TAR"; then
+  echo "$ac_t""$TAR" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$TAR" && break
+done
+
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:683: checking for $ac_word" >&5
+echo "configure:718: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -861,6 +896,7 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@PACKAGE@%$PACKAGE%g
 s%@VERSION@%$VERSION%g
 s%@SET_MAKE@%$SET_MAKE%g
+s%@TAR@%$TAR%g
 s%@PERL@%$PERL%g
 
 CEOF
diff --git a/configure.in b/configure.in
index fc03afbfd..97766e934 100644
--- a/configure.in
+++ b/configure.in
@@ -3,6 +3,9 @@ AC_INIT(automake.in)
 
 AM_INIT_AUTOMAKE(automake, 1.1l)
 
+# Find an appropriate tar for use in "dist" targets.  A "best guess"
+# is good enough -- if we can't find GNU tar, we don't really care.
+AC_CHECK_PROGS(TAR, gnutar gtar tar)
 AC_PATH_PROG(PERL, perl)
 if test -z "$PERL"; then
    echo "fatal error: perl not found" 1>&2
diff --git a/data.am b/data.am
index 94502b19c..5647fcb5f 100644
--- a/data.am
+++ b/data.am
@@ -22,10 +22,10 @@ install-@DIR@DATA: $(@DIR@_DATA)
 ## a syntax error in sh.
 	@list="$(@DIR@_DATA)"; for p in $$list; do \
 	  if test -f $(srcdir)/$$p; then \
-	    echo "$(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p"; \
+	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p"; \
 	    $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p; \
 	  else if test -f $$p; then \
-	    echo "$(INSTALL_DATA) $$p $(@DIR@dir)/$$p"; \
+	    echo " $(INSTALL_DATA) $$p $(@DIR@dir)/$$p"; \
 	    $(INSTALL_DATA) $$p $(@DIR@dir)/$$p; \
 	  fi; fi; \
 	done
diff --git a/dist-vars.am b/dist-vars.am
index bdd0f39ec..5d3087573 100644
--- a/dist-vars.am
+++ b/dist-vars.am
@@ -21,5 +21,3 @@ VERSION = @VERSION@
 ## DIST_COMMON comes first so that README can be the very first file.
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \
 	$(TEXINFOS) $(MANS) $(EXTRA_DIST)
-
-TAR = tar
diff --git a/header.am b/header.am
index 2c4435bc5..3b0da9965 100644
--- a/header.am
+++ b/header.am
@@ -21,7 +21,7 @@ install-@DIR@HEADERS: $(@DIR@_HEADERS)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
 	@list="$(@DIR@_HEADERS)"; for p in $$list; do \
-	  echo "$(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p"; \
+	  echo " $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p"; \
 	  $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p; \
 	done
 
diff --git a/lib/am/data.am b/lib/am/data.am
index 94502b19c..5647fcb5f 100644
--- a/lib/am/data.am
+++ b/lib/am/data.am
@@ -22,10 +22,10 @@ install-@DIR@DATA: $(@DIR@_DATA)
 ## a syntax error in sh.
 	@list="$(@DIR@_DATA)"; for p in $$list; do \
 	  if test -f $(srcdir)/$$p; then \
-	    echo "$(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p"; \
+	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p"; \
 	    $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p; \
 	  else if test -f $$p; then \
-	    echo "$(INSTALL_DATA) $$p $(@DIR@dir)/$$p"; \
+	    echo " $(INSTALL_DATA) $$p $(@DIR@dir)/$$p"; \
 	    $(INSTALL_DATA) $$p $(@DIR@dir)/$$p; \
 	  fi; fi; \
 	done
diff --git a/lib/am/header.am b/lib/am/header.am
index 2c4435bc5..3b0da9965 100644
--- a/lib/am/header.am
+++ b/lib/am/header.am
@@ -21,7 +21,7 @@ install-@DIR@HEADERS: $(@DIR@_HEADERS)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
 	@list="$(@DIR@_HEADERS)"; for p in $$list; do \
-	  echo "$(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p"; \
+	  echo " $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p"; \
 	  $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p; \
 	done
 
diff --git a/lib/am/libs.am b/lib/am/libs.am
index b5abb0cc1..edbbf673f 100644
--- a/lib/am/libs.am
+++ b/lib/am/libs.am
@@ -22,7 +22,7 @@ install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES)
 ## a syntax error in sh.
 	list="$(@DIR@_LIBRARIES)"; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo "$(INSTALL_DATA) $$p $(@DIR@dir)/$$p"; \
+	    echo " $(INSTALL_DATA) $$p $(@DIR@dir)/$$p"; \
 	    $(INSTALL_DATA) $$p $(@DIR@dir)/$$p; \
 	  else :; fi; \
 	done
@@ -35,7 +35,7 @@ install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES)
 	@list="$(@DIR@_LIBRARIES)"; for p in $$list; do \
 	  if test -f $$p; then \
 ## Must ranlib after installing because mod time changes.
-	    echo "$(RANLIB) $(@DIR@dir)/$$p"; \
+	    echo " $(RANLIB) $(@DIR@dir)/$$p"; \
 	    $(RANLIB) $(@DIR@dir)/$$p; \
 	  else :; fi; \
 	done
diff --git a/lib/am/lisp.am b/lib/am/lisp.am
index 160dfdfab..1d6e9bcc0 100644
--- a/lib/am/lisp.am
+++ b/lib/am/lisp.am
@@ -21,11 +21,11 @@ install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
 	@list="$(@DIR@_LISP)"; for p in $$list; do \
-	  echo "$(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p"; \
+	  echo " $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p"; \
 	  $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p; \
 ## Only install .elc file if it exists.
 	  if test -f $${p}c; then \
-	    echo "$(INSTALL_DATA) $${p}c $(@DIR@dir)/$${p}c"; \
+	    echo " $(INSTALL_DATA) $${p}c $(@DIR@dir)/$${p}c"; \
 	    $(INSTALL_DATA) $${p}c $(@DIR@dir)/$${p}c; \
 	  else : ; fi; \
 	done
diff --git a/lib/am/progs.am b/lib/am/progs.am
index 6b4dc22b4..432af8739 100644
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -27,7 +27,7 @@ install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS)
 ## a real libtool, its behaviour is identical to normal INSTALL_PROGRAM.
 ## Note that we explicitly set the libtool mode.  This avoids any lossage
 ## if the program doesn't have a name that libtool expects.
-	    echo "@LIBTOOL@ $(INSTALL_PROGRAM) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \
+	    echo " @LIBTOOL@ $(INSTALL_PROGRAM) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \
 	    @LIBTOOL@ $(INSTALL_PROGRAM) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
 	  else :; fi; \
 	done
diff --git a/lib/am/scripts.am b/lib/am/scripts.am
index 8696ed8c1..6700f4462 100644
--- a/lib/am/scripts.am
+++ b/lib/am/scripts.am
@@ -22,10 +22,10 @@ install-@DIR@SCRIPTS: $(@DIR@_SCRIPTS)
 ## a syntax error in sh.
 	@list="$(@DIR@_SCRIPTS)"; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo "$(INSTALL_SCRIPT) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \
+	    echo " $(INSTALL_SCRIPT) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \
 	    $(INSTALL_SCRIPT) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
 	  else if test -f $(srcdir)/$$p; then \
-	    echo "$(INSTALL_SCRIPT) $(srcdir)/$$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \
+	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \
 	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
 	  else :; fi; fi; \
 	done
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index edd4c25a1..765d2b231 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -60,7 +60,7 @@ install-info-am: $(INFO_DEPS)
 ## be relative, for the install.
 	  for ifile in `cd $(srcdir) && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
 	    if test -f $(srcdir)/$$ifile; then \
-	      echo "$(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile"; \
+	      echo " $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile"; \
 	      $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \
 	    else : ; fi; \
 	  done; \
@@ -74,7 +74,7 @@ install-info-am: $(INFO_DEPS)
 ## instance if you don't have a dir file, install-info will fail.  I
 ## think instead it should create a new dir file for you.  This bug
 ## causes the `make distcheck' target to fail reliably.
-	    echo "install-info --info-dir=$(infodir) $(infodir)/$$file";\
+	    echo " install-info --info-dir=$(infodir) $(infodir)/$$file";\
 	    install-info --info-dir=$(infodir) $(infodir)/$$file; :;\
 	  done; \
 	else : ; fi
diff --git a/libs.am b/libs.am
index b5abb0cc1..edbbf673f 100644
--- a/libs.am
+++ b/libs.am
@@ -22,7 +22,7 @@ install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES)
 ## a syntax error in sh.
 	list="$(@DIR@_LIBRARIES)"; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo "$(INSTALL_DATA) $$p $(@DIR@dir)/$$p"; \
+	    echo " $(INSTALL_DATA) $$p $(@DIR@dir)/$$p"; \
 	    $(INSTALL_DATA) $$p $(@DIR@dir)/$$p; \
 	  else :; fi; \
 	done
@@ -35,7 +35,7 @@ install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES)
 	@list="$(@DIR@_LIBRARIES)"; for p in $$list; do \
 	  if test -f $$p; then \
 ## Must ranlib after installing because mod time changes.
-	    echo "$(RANLIB) $(@DIR@dir)/$$p"; \
+	    echo " $(RANLIB) $(@DIR@dir)/$$p"; \
 	    $(RANLIB) $(@DIR@dir)/$$p; \
 	  else :; fi; \
 	done
diff --git a/lisp.am b/lisp.am
index 160dfdfab..1d6e9bcc0 100644
--- a/lisp.am
+++ b/lisp.am
@@ -21,11 +21,11 @@ install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
 	@list="$(@DIR@_LISP)"; for p in $$list; do \
-	  echo "$(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p"; \
+	  echo " $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p"; \
 	  $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p; \
 ## Only install .elc file if it exists.
 	  if test -f $${p}c; then \
-	    echo "$(INSTALL_DATA) $${p}c $(@DIR@dir)/$${p}c"; \
+	    echo " $(INSTALL_DATA) $${p}c $(@DIR@dir)/$${p}c"; \
 	    $(INSTALL_DATA) $${p}c $(@DIR@dir)/$${p}c; \
 	  else : ; fi; \
 	done
diff --git a/ltlibs.am b/ltlibs.am
index be0c553a3..250309a24 100644
--- a/ltlibs.am
+++ b/ltlibs.am
@@ -24,7 +24,7 @@ install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS)
 	  if test -f $$p; then \
 ## Note that we explicitly set the libtool mode.  This avoids any lossage
 ## if the program doesn't have a name that libtool expects.
-	    echo "$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(@DIR@dir)/$$p"; \
+	    echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(@DIR@dir)/$$p"; \
 	    $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(@DIR@dir)/$$p; \
 	  else :; fi; \
 	done
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 3a07d9573..416fddc91 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -40,6 +40,7 @@ transform = @program_transform_name@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
+TAR = @TAR@
 VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = gnits
@@ -60,8 +61,6 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \
 	$(TEXINFOS) $(MANS) $(EXTRA_DIST)
-
-TAR = tar
 default: all
 
 .SUFFIXES:
diff --git a/progs.am b/progs.am
index 6b4dc22b4..432af8739 100644
--- a/progs.am
+++ b/progs.am
@@ -27,7 +27,7 @@ install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS)
 ## a real libtool, its behaviour is identical to normal INSTALL_PROGRAM.
 ## Note that we explicitly set the libtool mode.  This avoids any lossage
 ## if the program doesn't have a name that libtool expects.
-	    echo "@LIBTOOL@ $(INSTALL_PROGRAM) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \
+	    echo " @LIBTOOL@ $(INSTALL_PROGRAM) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \
 	    @LIBTOOL@ $(INSTALL_PROGRAM) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
 	  else :; fi; \
 	done
diff --git a/scripts.am b/scripts.am
index 8696ed8c1..6700f4462 100644
--- a/scripts.am
+++ b/scripts.am
@@ -22,10 +22,10 @@ install-@DIR@SCRIPTS: $(@DIR@_SCRIPTS)
 ## a syntax error in sh.
 	@list="$(@DIR@_SCRIPTS)"; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo "$(INSTALL_SCRIPT) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \
+	    echo " $(INSTALL_SCRIPT) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \
 	    $(INSTALL_SCRIPT) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
 	  else if test -f $(srcdir)/$$p; then \
-	    echo "$(INSTALL_SCRIPT) $(srcdir)/$$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \
+	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \
 	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
 	  else :; fi; fi; \
 	done
diff --git a/tests/ChangeLog b/tests/ChangeLog
index c41e1649c..b0ba635b2 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 11 09:51:47 1997  Tom Tromey  <tromey@cygnus.com>
+
+	* texinfo2.test: Fixed quoting bug.  From Michael Brantley.
+
 Tue Feb  4 18:41:32 1997  Tom Tromey  <tromey@cygnus.com>
 
 	* confsub.test: Check subdir/Makefile.in to make sure dependency
diff --git a/tests/Makefile.in b/tests/Makefile.in
index c4228083c..c641ec126 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -40,6 +40,7 @@ transform = @program_transform_name@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
+TAR = @TAR@
 VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = gnits
@@ -72,8 +73,6 @@ DIST_COMMON =  ChangeLog Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \
 	$(TEXINFOS) $(MANS) $(EXTRA_DIST)
-
-TAR = tar
 default: all
 
 .SUFFIXES:
diff --git a/tests/texinfo2.test b/tests/texinfo2.test
index d5ad9870b..6ca27fe7a 100755
--- a/tests/texinfo2.test
+++ b/tests/texinfo2.test
@@ -17,4 +17,4 @@ END
 
 $AUTOMAKE || exit 1
 
-test -z `make -s -f Makefile.in magic | grep '~'`
+test -z "`make -s -f Makefile.in magic | grep '~'`"
diff --git a/texinfos.am b/texinfos.am
index edd4c25a1..765d2b231 100644
--- a/texinfos.am
+++ b/texinfos.am
@@ -60,7 +60,7 @@ install-info-am: $(INFO_DEPS)
 ## be relative, for the install.
 	  for ifile in `cd $(srcdir) && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
 	    if test -f $(srcdir)/$$ifile; then \
-	      echo "$(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile"; \
+	      echo " $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile"; \
 	      $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \
 	    else : ; fi; \
 	  done; \
@@ -74,7 +74,7 @@ install-info-am: $(INFO_DEPS)
 ## instance if you don't have a dir file, install-info will fail.  I
 ## think instead it should create a new dir file for you.  This bug
 ## causes the `make distcheck' target to fail reliably.
-	    echo "install-info --info-dir=$(infodir) $(infodir)/$$file";\
+	    echo " install-info --info-dir=$(infodir) $(infodir)/$$file";\
 	    install-info --info-dir=$(infodir) $(infodir)/$$file; :;\
 	  done; \
 	else : ; fi
diff --git a/version.texi b/version.texi
index 497e41a9c..0f08a4b4f 100644
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 7 January 1997
+@set UPDATED 6 February 1997
 @set EDITION 1.1l
 @set VERSION 1.1l