typo in earlier fix. texinfo fix

diff --git a/ChangeLog b/ChangeLog
index b7c6444..18b0f01 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Wed Apr 16 00:05:47 1997  Tom Tromey  <tromey@cygnus.com>
 
+       * texinfos.am (.texi.info, .texi, .texinfo.info, .info): Remove
+
        * automake.in (define_program_variable): Added `override' argument.
        (handle_texinfo): Pass override arg when defining MAKEINFO.
        (AC_MISSING_PROG): New constant.

diff --git a/Makefile.in b/Makefile.in
index 8eeec71..c163b0e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -198,6 +198,7 @@ automake.dvi: automake.texi version.texi
 DVIPS = dvips
 
 .texi.info:
+       @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
        cd $(srcdir) \
          && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 
@@ -206,14 +207,17 @@ DVIPS = dvips
          MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
 
 .texi:
+       @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
        cd $(srcdir) \
          && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 
 .texinfo.info:
+       @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
        cd $(srcdir) \
          && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 
 .texinfo:
+       @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
        cd $(srcdir) \
          && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 

diff --git a/automake.in b/automake.in
index 025e88b..6593b96 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1953,7 +1953,7 @@ sub handle_texinfo
     &push_phony_cleaners ('aminfo');
     if ($cygnus_mode)
     {
-       $output_rules .= "clean-info: mostlyclean-info\n";
+       $output_rules .= "clean-info: mostlyclean-aminfo\n";
     }
 
     push (@suffixes, '.texi', '.texinfo', '.info', '.dvi', '.ps');

diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 3ef6c69..85e9d92 100644 (file)
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -20,8 +20,14 @@
 ## probably the simplest way.  However, at Cygnus .info files are
 ## always put into the build directory.  So at runtime we select which
 ## rule to use.
+## Note that we also remove the possible output files before running
+## makeinfo.  Otherwise, if the texinfo file shrinks (or if you start
+## using --no-split), you'll be left with some dead info files lying
+## around -- dead files which will end up in the distribution.
+NOTCYGNUS      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
 NOTCYGNUS      cd $(srcdir) \
 NOTCYGNUS        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+CYGNUS @rm -f $@ $@-[0-9] $@-[0-9][0-9]
 CYGNUS $(MAKEINFO) -I $(srcdir) $<
 
 .texi.dvi:
@@ -35,8 +41,14 @@ CYGNUS       $(MAKEINFO) -I $(srcdir) $<
 ## probably the simplest way.  However, at Cygnus .info files are
 ## always put into the build directory.  So at runtime we select which
 ## rule to use.
+## Note that we also remove the possible output files before running
+## makeinfo.  Otherwise, if the texinfo file shrinks (or if you start
+## using --no-split), you'll be left with some dead info files lying
+## around -- dead files which will end up in the distribution.
+NOTCYGNUS      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
 NOTCYGNUS      cd $(srcdir) \
 NOTCYGNUS        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+CYGNUS @rm -f $@ $@-[0-9] $@-[0-9][0-9]
 CYGNUS $(MAKEINFO) -I $(srcdir) $<
 
 .texinfo.info:
@@ -44,8 +56,14 @@ CYGNUS       $(MAKEINFO) -I $(srcdir) $<
 ## probably the simplest way.  However, at Cygnus .info files are
 ## always put into the build directory.  So at runtime we select which
 ## rule to use.
+## Note that we also remove the possible output files before running
+## makeinfo.  Otherwise, if the texinfo file shrinks (or if you start
+## using --no-split), you'll be left with some dead info files lying
+## around -- dead files which will end up in the distribution.
+NOTCYGNUS      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
 NOTCYGNUS      cd $(srcdir) \
 NOTCYGNUS        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+CYGNUS @rm -f $@ $@-[0-9] $@-[0-9][0-9]
 CYGNUS $(MAKEINFO) $<
 
 .texinfo:
@@ -53,8 +71,14 @@ CYGNUS       $(MAKEINFO) $<
 ## probably the simplest way.  However, at Cygnus .info files are
 ## always put into the build directory.  So at runtime we select which
 ## rule to use.
+## Note that we also remove the possible output files before running
+## makeinfo.  Otherwise, if the texinfo file shrinks (or if you start
+## using --no-split), you'll be left with some dead info files lying
+## around -- dead files which will end up in the distribution.
+NOTCYGNUS      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
 NOTCYGNUS      cd $(srcdir) \
 NOTCYGNUS        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+CYGNUS @rm -f $@ $@-[0-9] $@-[0-9][0-9]
 CYGNUS $(MAKEINFO) $<
 
 .texinfo.dvi:

diff --git a/stamp-vti b/stamp-vti
index 68d8b4d..0e0196b 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,3 +1,3 @@
-@set UPDATED 10 April 1997
+@set UPDATED 16 April 1997
 @set EDITION 1.1n
 @set VERSION 1.1n

diff --git a/texinfos.am b/texinfos.am
index 3ef6c69..85e9d92 100644 (file)
--- a/texinfos.am
+++ b/texinfos.am
@@ -20,8 +20,14 @@
 ## probably the simplest way.  However, at Cygnus .info files are
 ## always put into the build directory.  So at runtime we select which
 ## rule to use.
+## Note that we also remove the possible output files before running
+## makeinfo.  Otherwise, if the texinfo file shrinks (or if you start
+## using --no-split), you'll be left with some dead info files lying
+## around -- dead files which will end up in the distribution.
+NOTCYGNUS      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
 NOTCYGNUS      cd $(srcdir) \
 NOTCYGNUS        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+CYGNUS @rm -f $@ $@-[0-9] $@-[0-9][0-9]
 CYGNUS $(MAKEINFO) -I $(srcdir) $<
 
 .texi.dvi:
@@ -35,8 +41,14 @@ CYGNUS       $(MAKEINFO) -I $(srcdir) $<
 ## probably the simplest way.  However, at Cygnus .info files are
 ## always put into the build directory.  So at runtime we select which
 ## rule to use.
+## Note that we also remove the possible output files before running
+## makeinfo.  Otherwise, if the texinfo file shrinks (or if you start
+## using --no-split), you'll be left with some dead info files lying
+## around -- dead files which will end up in the distribution.
+NOTCYGNUS      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
 NOTCYGNUS      cd $(srcdir) \
 NOTCYGNUS        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+CYGNUS @rm -f $@ $@-[0-9] $@-[0-9][0-9]
 CYGNUS $(MAKEINFO) -I $(srcdir) $<
 
 .texinfo.info:
@@ -44,8 +56,14 @@ CYGNUS       $(MAKEINFO) -I $(srcdir) $<
 ## probably the simplest way.  However, at Cygnus .info files are
 ## always put into the build directory.  So at runtime we select which
 ## rule to use.
+## Note that we also remove the possible output files before running
+## makeinfo.  Otherwise, if the texinfo file shrinks (or if you start
+## using --no-split), you'll be left with some dead info files lying
+## around -- dead files which will end up in the distribution.
+NOTCYGNUS      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
 NOTCYGNUS      cd $(srcdir) \
 NOTCYGNUS        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+CYGNUS @rm -f $@ $@-[0-9] $@-[0-9][0-9]
 CYGNUS $(MAKEINFO) $<
 
 .texinfo:
@@ -53,8 +71,14 @@ CYGNUS       $(MAKEINFO) $<
 ## probably the simplest way.  However, at Cygnus .info files are
 ## always put into the build directory.  So at runtime we select which
 ## rule to use.
+## Note that we also remove the possible output files before running
+## makeinfo.  Otherwise, if the texinfo file shrinks (or if you start
+## using --no-split), you'll be left with some dead info files lying
+## around -- dead files which will end up in the distribution.
+NOTCYGNUS      @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
 NOTCYGNUS      cd $(srcdir) \
 NOTCYGNUS        && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+CYGNUS @rm -f $@ $@-[0-9] $@-[0-9][0-9]
 CYGNUS $(MAKEINFO) $<
 
 .texinfo.dvi:

diff --git a/version.texi b/version.texi
index 68d8b4d..0e0196b 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 10 April 1997
+@set UPDATED 16 April 1997
 @set EDITION 1.1n
 @set VERSION 1.1n