doc fixes

diff --git a/TODO b/TODO
index 4f2a582a02c7556c2302b691f6d60aa01b16a022..b3b9d5d99a3ea07d455e44ec2c79250ce4552abe 100644 (file)
--- a/TODO
+++ b/TODO
@@ -126,11 +126,6 @@ Per> then it should be able to realize it can build .class files from
 Per> .java files, and thus be able to generate a list of
 Per> .class files from a list of .java source files.
 
-From Jason Molenda:
-* allow a way to use "gzip --best"
-   [ Try  GZIP=--best make dist ]
-* don't assume GNU tar is "tar" (eg in distcheck)
-
 !! Must fix require_file stuff.  It is really gross, and I don't
    understand it any more.
 
@@ -367,8 +362,6 @@ how to use the generated makefiles
 
 what goes in AC_CONFIG_AUX_DIR
 
-TEXINFO_TEX
-
 multi-":" mode in AC_OUTPUT -- automake only looks at the first file
     also a note on how a .am file is found in this case
 
@@ -448,6 +441,9 @@ tcl/unix/Makefile.in has some code to generate a Solaris package.
 Automake probably can't do all of this on its own.  A new tool might
 be a better idea
 
+I have some notes from a Debian developer on how the integration
+should work
+
 ================================================================
 
 A tool to guess what the local Makefile.am should look like:

diff --git a/automake.texi b/automake.texi
index a6404dd55ecb059f84697ad1f1812c029a02adcd..8f40951e62d87f26b921f26d2db1b257deeceee2 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -20,7 +20,7 @@
 @ifinfo
 This file documents GNU automake @value{VERSION}
 
-Copyright (C) 1995, 96 Free Software Foundation, Inc.
+Copyright (C) 1995, 96, 97 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -1883,9 +1883,22 @@ By default, Automake requires the file @file{texinfo.tex} to appear in
 the same directory as the Texinfo source.  However, if you used
 @code{AC_CONFIG_AUX_DIR} in @file{configure.in}, then @file{texinfo.tex}
 is looked for there.  Automake supplies @file{texinfo.tex} if
-@samp{--add-missing} is given.  The option @samp{no-texinfo.tex} can be
-used to eliminate the requirement for @file{texinfo.tex}; this is useful
-if manuals appear in many directories.
+@samp{--add-missing} is given.
+
+If your package has Texinfo files in many directories, you can use the
+variable @code{TEXINFO_TEX} to tell automake where to find the canonical
+@file{texinfo.tex} for your package.  The value of this variable should
+be the relative path from the current @file{Makefile.am} to
+@file{texinfo.tex}:
+
+@example
+TEXINFO_TEX = ../doc/texinfo.tex
+@end example
+
+The option @samp{no-texinfo.tex} can be used to eliminate the
+requirement for @file{texinfo.tex}.  Use of the variable
+@code{TEXINFO_TEX} is preferable, however, because that allows the
+@code{dvi} target to still work.
 
 Automake generates an @code{install-info} target; some people apparently
 use this.  By default, info pages are installed by @samp{make install}.

diff --git a/stamp-vti b/stamp-vti
index 0e0196b2d77873fe5a3526276cf636d07a4393a4..93b5eba2085d93702ff1543520f8815f4cba40e0 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,3 +1,3 @@
-@set UPDATED 16 April 1997
+@set UPDATED 26 April 1997
 @set EDITION 1.1n
 @set VERSION 1.1n

diff --git a/version.texi b/version.texi
index 0e0196b2d77873fe5a3526276cf636d07a4393a4..93b5eba2085d93702ff1543520f8815f4cba40e0 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 16 April 1997
+@set UPDATED 26 April 1997
 @set EDITION 1.1n
 @set VERSION 1.1n