fixed remake2.test

diff --git a/ChangeLog b/ChangeLog
index 6cb32ac..366053c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Sat Dec  7 11:34:39 1996  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (handle_configure): Pass correct args to automake
+       invocations.  Test remake2.test.
+
        * automake.in (handle_configure): Check dirname of $file, not of
        $local.  Test output2.test.
 

diff --git a/Makefile.in b/Makefile.in
index 6989550..0a65d13 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.1k from Makefile.am
+# Makefile.in generated automatically by automake 1.1l from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -95,16 +95,16 @@ default: all
 
 .SUFFIXES:
 .SUFFIXES: .texi .texinfo .info .dvi
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in 
+       cd $(top_srcdir) && automake --gnits Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+       cd $(top_builddir) \
+         && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
 $(srcdir)/aclocal.m4: configure.in
        cd $(srcdir) && aclocal
 
-$(srcdir)/Makefile.in: Makefile.am configure.in
-       cd $(srcdir) && automake --gnits Makefile
-
-# For an explanation of the following Makefile rules, see node
-# `Automatic Remaking' in GNU Autoconf documentation.
-Makefile: $(srcdir)/Makefile.in config.status $(BUILT_SOURCES)
-       CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 config.status: configure
        $(SHELL) ./config.status --recheck
 $(srcdir)/configure: configure.in $(ACLOCAL) $(CONFIGURE_DEPENDENCIES)
@@ -173,6 +173,8 @@ automake.info: automake.texi version.texi
 automake.dvi: automake.texi version.texi
 
 
+DVIPS = dvips
+
 .texi.info:
        cd $(srcdir) \
          && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
@@ -187,6 +189,8 @@ automake.dvi: automake.texi version.texi
 
 .texinfo.dvi:
        TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
+.dvi.ps:
+       $(DVIPS) $< -o $@
 
 install-info-am: $(INFO_DEPS)
        $(NORMAL_INSTALL)

diff --git a/automake.in b/automake.in
index 85307e7..a4178d1 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2349,15 +2349,15 @@ sub handle_configure
     local ($top_reldir);
 
     # Handle $local:$input syntax again.
-    local ($amfile, $infile, $colon_infile);
+    local ($infile, $colon_infile);
 
-    $input = &basename ($input);
-    $local = &basename ($local);
+    local ($input_base) = &basename ($input);
+    local ($local_base) = &basename ($local);
 
-    $amfile = $input . '.am';
+    local ($amfile) = $input_base . '.am';
     # We know we can always add '.in' because it really should be an
     # error if the .in was missing originally.
-    $infile = '$(srcdir)/' . $input . '.in';
+    $infile = '$(srcdir)/' . $input_base . '.in';
     if ($local ne $input)
     {
        $colon_infile = ':' . $input . '.in';
@@ -2376,7 +2376,7 @@ sub handle_configure
                      . ' ' . $input . $colon_infile . "\n\n");
 
     # This rule remakes the Makefile.
-    $output_rules .= ($local . ': ' . $infile . ' '
+    $output_rules .= ($local_base . ': ' . $infile . ' '
                      . '$(top_builddir)/config.status $(BUILT_SOURCES)'
                      . "\n"
                      . "\tcd \$(top_builddir) \\\n"

diff --git a/configure b/configure
index 0f84284..f7336d1 100755 (executable)
--- a/configure
+++ b/configure
@@ -608,7 +608,7 @@ cat >> confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
 
-VERSION=1.1k
+VERSION=1.1l
 
 cat >> confdefs.h <<EOF
 #define VERSION "$VERSION"

diff --git a/configure.in b/configure.in
index 1236bd5..fc03afb 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.1k)
+AM_INIT_AUTOMAKE(automake, 1.1l)
 
 AC_PATH_PROG(PERL, perl)
 if test -z "$PERL"; then

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 8ee40f9..4790e1c 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.1k from Makefile.am
+# Makefile.in generated automatically by automake 1.1l from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -66,9 +66,9 @@ default: all
 
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in 
-       cd $(top_srcdir) && automake --gnits Makefile
+       cd $(top_srcdir) && automake --gnits m4/Makefile
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+m4/Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 023b26d..f400fe8 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.1k from Makefile.am
+# Makefile.in generated automatically by automake 1.1l from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -58,7 +58,7 @@ confsub.test primary.test primary2.test depend2.test spell3.test \
 comment2.test vpath.test symlink.test discover.test acinclude.test req.test \
 acsilent.test distdir.test lex2.test libobj4.test libobj5.test version.test \
 ranlib.test confvar.test confvar2.test stdlib.test cxxo.test colon2.test \
-colon3.test remake.test output.test output2.test
+colon3.test remake.test output.test output2.test remake2.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -77,9 +77,9 @@ default: all
 
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in 
-       cd $(top_srcdir) && automake --gnits Makefile
+       cd $(top_srcdir) && automake --gnits tests/Makefile
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+tests/Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 

diff --git a/tests/remake2.test b/tests/remake2.test
index f2961d8..74545f0 100755 (executable)
--- a/tests/remake2.test
+++ b/tests/remake2.test
@@ -17,4 +17,4 @@ mkdir sub
 
 $AUTOMAKE || exit 1
 
-grep 'automake.*sub/Makefile' Makefile.in
+grep 'automake.*sub/Makefile' sub/Makefile.in

diff --git a/version.texi b/version.texi
index cc28ebd..30b8784 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
 @set UPDATED 5 December 1996
-@set EDITION 1.1k
-@set VERSION 1.1k
+@set EDITION 1.1l
+@set VERSION 1.1l