bug fix and version increment

diff --git a/ChangeLog b/ChangeLog
index 64cd0da..60b3608 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Dec  2 12:13:27 1996  Tom Tromey  <tromey@cygnus.com>
+
+       * Released 1.1i.
+
+       From Janos Farkas:
+       * automake.in (handle_texinfo): Must quote $ for make.
+
 Sun Dec  1 15:08:09 1996  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (handle_configure): Correctly handle common case of

diff --git a/Makefile.in b/Makefile.in
index e1b24c7..2b797ad 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,10 +78,10 @@ TEXINFOS = automake.texi
 DATA =  $(pkgdata_DATA)
 
 DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-Makefile.in NEWS README README-alpha THANKS TODO aclocal.in aclocal.m4 \
-ansi2knr.1 ansi2knr.c automake.in config.guess config.sub configure \
-configure.in elisp-comp install-sh interlock mdate-sh mkinstalldirs \
-stamp-vti texinfo.tex version.texi ylwrap
+Makefile.in NEWS README README-alpha THANKS TODO aclocal.m4 ansi2knr.1 \
+ansi2knr.c automake.in config.guess config.sub configure configure.in \
+elisp-comp install-sh interlock mdate-sh mkinstalldirs stamp-vti \
+texinfo.tex version.texi ylwrap
 
 
 PACKAGE = @PACKAGE@
@@ -111,7 +111,7 @@ $(srcdir)/configure: configure.in $(ACLOCAL) $(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && autoconf
 automake: $(top_builddir)/config.status automake.in
        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
-aclocal: $(top_builddir)/config.status aclocal.in
+aclocal: $(top_builddir)/config.status automake.in aclocal.in
        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
 
 install-binSCRIPTS: $(bin_SCRIPTS)
@@ -435,7 +435,7 @@ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
 all-recursive check-recursive installcheck-recursive info-recursive \
 dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
+distclean-tags clean-tags maintainer-clean-tags distdir info dvi check \
 installcheck-local installcheck all-am install-exec-am install-data-am \
 uninstall-am install-exec install-data install uninstall all \
 installdirs mostlyclean-generic distclean-generic clean-generic \

diff --git a/aclocal.m4 b/aclocal.m4
index 00e786c..c8303c5 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.1g
+dnl aclocal.m4 generated automatically by aclocal 1.1h
 
 # Do all the work for Automake.  This macro actually does too much --
 # some checks are only needed if your package does certain things.

diff --git a/automake.in b/automake.in
index 4b7ca5f..70a8f7e 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1599,7 +1599,7 @@ sub handle_texinfo
     &pretty_print_rule ("\trm -f", "\t  ", @texi_cleans);
     $output_rules .= ("\nclean-info:\n\ndistclean-info:\n\n"
                      . "maintainer-clean-info:\n\t"
-                     . 'for i in $(INFO_DEPS); do rm `eval echo $i*`; done'
+                     . 'for i in $(INFO_DEPS); do rm `eval echo $$i*`; done'
                      . "\n");
     &push_phony_cleaners ('info');
 

diff --git a/configure b/configure
index b9073e9..077d42b 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.11.2 
+# Generated automatically using autoconf version 2.12 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -332,7 +332,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.11.2"
+    echo "configure generated by autoconf version 2.12"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -608,7 +608,7 @@ cat >> confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
 
-VERSION=1.1h
+VERSION=1.1i
 
 cat >> confdefs.h <<EOF
 #define VERSION "$VERSION"
@@ -814,7 +814,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.11.2"
+    echo "$CONFIG_STATUS generated by autoconf version 2.12"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;

diff --git a/configure.in b/configure.in
index e6a43f0..f3faff9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(automake.in)
 
-AM_INIT_AUTOMAKE(automake, 1.1h)
+AM_INIT_AUTOMAKE(automake, 1.1i)
 
 AC_PATH_PROG(PERL, perl)
 if test -z "$PERL"; then

diff --git a/m4/Makefile.in b/m4/Makefile.in
index e6283ec..e06cdaf 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -105,7 +105,6 @@ distdir: $(DISTFILES)
 info:
 dvi:
 check: all
-       $(MAKE)
 installcheck:
 install-exec: 
        $(NORMAL_INSTALL)
@@ -152,8 +151,8 @@ maintainer-clean:  maintainer-clean-generic distclean
        @echo "it deletes files that may require special tools to rebuild."
 
 .PHONY: default uninstall-m4dataDATA install-m4dataDATA tags distdir \
-info dvi installcheck install-exec install-data install uninstall all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
+info dvi check installcheck install-exec install-data install uninstall \
+all installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index adbdfe9..5f35989 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -119,8 +119,7 @@ check-TESTS: $(TESTS)
        fi
 info:
 dvi:
-check: all
-       $(MAKE) check-TESTS
+check: all check-TESTS
 installcheck:
 install-exec: 
        $(NORMAL_INSTALL)
@@ -165,7 +164,7 @@ maintainer-clean:  maintainer-clean-generic distclean
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."
 
-.PHONY: default tags distdir check-TESTS info dvi installcheck \
+.PHONY: default tags distdir check-TESTS info dvi check installcheck \
 install-exec install-data install uninstall all installdirs \
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean

diff --git a/version.texi b/version.texi
index fc7b819..68f8c77 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
 @set UPDATED 28 November 1996
-@set EDITION 1.1h
-@set VERSION 1.1h
+@set EDITION 1.1i
+@set VERSION 1.1i