bug fix

diff --git a/ChangeLog b/ChangeLog
index 0c712dd..5213b62 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Oct 20 12:08:46 1996  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (handle_dist_worker): Explicitly pass distdir to
+       dist-hook make.  From Tatu Ylonen.
+
+       * m4/strtod.m4: Use correct cache variable.
+
 Thu Oct 17 13:45:20 1996  Tom Tromey  <tromey@cygnus.com>
 
        Lisp fixes from Erick Branderhorst:

diff --git a/THANKS b/THANKS
index 96c5df1..b20a717 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -29,6 +29,7 @@ Noah Friedman <friedman@gnu.ai.mit.edu>
 Nyul Laszlo <nyul@sol.cc.u-szeged.hu>
 Per Bothner <bothner@cygnus.com>
 Steve M. Robbins <steve@nyongwa.montreal.qc.ca>
+Tatu Ylonen <ylo@ssh.fi>
 Thomas Morgan <tmorgan@pobox.com>
 Tom Tromey <tromey@cygnus.com>
 Ulrich Drepper <drepper@gnu.ai.mit.edu>

diff --git a/TODO b/TODO
index 762d49d..ba626c2 100644 (file)
--- a/TODO
+++ b/TODO
@@ -8,6 +8,10 @@ Priorities for release:
 
 !! foo_LIBRARIES = @JOE@  ->  _LIBFILES is wrong
 
+!! EXTRA_FOO should not be allowed to contain automake interpolations
+   the whole point of this variable is so automake can statically know...
+   This should probably be true for all EXTRA_ variables
+
 * BUILT_SOURCES should be examined by automake, %dep_files should be
   updated to handle it.
 
@@ -352,6 +356,9 @@ use of (eg) EXTRA_PROGRAMS is not very clear right now
 
 document EXTRA_DIST_DIRS, distributing things in subdirs
 
+document EXTRA_foo_SOURCES
+
+document why EXTRA_* vars must be statically knowable
 
 ================================================================
 

diff --git a/automake.in b/automake.in
index ba81419..f6089c9 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1666,7 +1666,8 @@ sub handle_dist_worker
     # packaged up.
     if (defined $contents{'dist-hook'})
     {
-       $output_rules .= "\t\$(MAKE) dist-hook\n";
+       # We must explicitly set distdir here.
+       $output_rules .= "\t\$(MAKE) distdir=\"$(distdir)\" dist-hook\n";
     }
 
     push (@phony, 'distdir');

diff --git a/automake.texi b/automake.texi
index c22bcda..a4787e1 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -292,6 +292,13 @@ target of a similar name that would be automatically generated by
 best to avoid making use of it, as sometimes the generated rules are
 very particular.
 
+Similarly, a variable defined in @file{Makefile.am} will override any
+definition of the variable that @code{automake} would ordinarily create.
+This feature is more often useful than the ability to override a target
+definition.  Be warned that many of the variables generated by
+@code{automake} are considered to be for internal use only, and their
+names might change in future releases.
+
 When examining a variable definition, Automake will recursively examine
 variables referenced in the definition.  Eg if Automake is looking at
 the content of @samp{foo_SOURCES} in this snippet

diff --git a/m4/strtod.m4 b/m4/strtod.m4
index d9e0085..8aaf4b7 100644 (file)
--- a/m4/strtod.m4
+++ b/m4/strtod.m4
@@ -61,7 +61,7 @@ AC_SUBST(LIBOBJS)dnl
 am_cv_func_strtod_needs_libm=no
 if test $am_cv_func_strtod = no; then
   AC_CHECK_FUNCS(pow)
-  if test $am_cv_func_pow = no; then
+  if test $ac_cv_func_pow = no; then
     AC_CHECK_LIB(m, pow, [am_cv_func_strtod_needs_libm=yes],
                 [AC_MSG_WARN(can't find library containing definition of pow)])
   fi