A few minor fixes to the manual and automake files.

diff --git a/ChangeLog b/ChangeLog
index cf9bf617dc0b85f71712c0b557b8bfb2753c52e8..409db2b972962a99aa312830734b450398474bf9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-10-25  Paul D. Smith  <psmith@gnu.org>
+
+       * doc/make.texi (Quick Reference): Add references to $(eval ...)
+       and $(value ...).
+       (Recursion): Add a variable index entry for CURDIR.
+
+       * README.cvs: Update to appropriate versions.
+       * Makefile.am (nodist_loadavg_SOURCES): automake gurus point out I
+       don't need to copy loadavg.c: automake is smart enough to create
+       it for me.  Still have a bug in automake related to ansi2knr tho.
+
 2002-10-14  Paul D. Smith  <psmith@gnu.org>
 
        * *.c: Convert to using ANSI C-style function definitions.

diff --git a/Makefile.am b/Makefile.am
index 8856962aae66cbe7c002900700247923c4d218d7..f01aeebfcf65fd37b672970760889139a5e6db0b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # This is a -*-Makefile-*-, or close enough
 
-AUTOMAKE_OPTIONS = 1.7 dist-bzip2 check-news ansi2knr
+AUTOMAKE_OPTIONS = 1.7.1 dist-bzip2 check-news ansi2knr
 ACLOCAL_AMFLAGS        =  -I config
 
 SUBDIRS =      glob config po doc
@@ -121,13 +121,10 @@ check-loadavg: loadavg
 
 # The loadavg function is invoked during "make check" to test getloadavg.
 noinst_PROGRAMS = loadavg
-nodist_loadavg_SOURCES = loadavg.c
-loadavg_CFLAGS = -DTEST
+nodist_loadavg_SOURCES = getloadavg.c
+loadavg_CPPFLAGS = -DTEST
 loadavg_LDADD = @GETLOADAVG_LIBS@
 
-loadavg.c: $(srcdir)/getloadavg.c
-       cp $(srcdir)/getloadavg.c loadavg.c
-
 # > check-regression
 #
 # Look for the make test suite, and run it if found and we can find perl.

diff --git a/NEWS b/NEWS
index 8a200f586a6f3bed782f317018e25bde4a905143..6c1161258ab40abf655f1a215a708692a36b050d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,11 +6,14 @@ Copyright (C) 2002  Free Software Foundation, Inc.
 See the end for copying conditions.
 
 All changes mentioned here are more fully described in the GNU make
-manual, which is contained in this distribution as the file make.texinfo.
+manual, which is contained in this distribution as the file doc/make.texi.
 
 Please send GNU make bug reports to <bug-make@gnu.org>.
 See the README file and the GNU make manual for details on sending bug
 reports.
+\f
+Version 3.81a1
+
 \f
 Version 3.80
 

diff --git a/README.cvs b/README.cvs
index 82e6f3730f8310b6c8e88f129d46b7fff05dac60..ff2d34141ee3fe71839ca6ad596289cd2475abb2 100644 (file)
--- a/README.cvs
+++ b/README.cvs
@@ -23,8 +23,8 @@ There is no password; just hit the ENTER key if you are asked for one.
 Building From CVS
 -----------------
 
-To build GNU make from CVS, you will need Autoconf 2.53 (or better),
-Automake 1.6.3 (or better), and Gettext 0.11.5 (or better), and any
+To build GNU make from CVS, you will need Autoconf 2.54 (or better),
+Automake 1.7.1 (or better), and Gettext 0.11.5 (or better), and any
 tools that those utilities require (GNU m4, Perl, etc.).  You will also
 need a copy of wget.
 

diff --git a/doc/make.texi b/doc/make.texi
index 3c01e0a674aa27d99f38ce4147e12cdf16dad299..1f491ad9992f5a0016b4c442fcc4687420aff8ac 100644 (file)
--- a/doc/make.texi
+++ b/doc/make.texi
@@ -3627,13 +3627,17 @@ also find it useful to declare targets that invoke recursive
 @code{make} commands as @samp{.PHONY} (for more discussion on when
 this is useful, see @ref{Phony Targets}).
 
-For your convenience, GNU @code{make} sets the variable @code{CURDIR} to
-the pathname of the current working directory for you.  If @code{-C} is
-in effect, it will contain the path of the new directory, not the
-original.  The value has the same precedence it would have if it were
+@vindex @code{CURDIR}
+For your convenience, when GNU @code{make} starts (after it has
+processed any @code{-C} options) it sets the variable @code{CURDIR} to
+the pathname of the current working directory.  This value is never
+touched by @code{make} again: in particular note that if you include
+files from other directories the value of @code{CURDIR} does not
+change.  The value has the same precedence it would have if it were
 set in the makefile (by default, an environment variable @code{CURDIR}
 will not override this value).  Note that setting this variable has no
-effect on the operation of @code{make}
+impact on the operation of @code{make} (it does not cause @code{make}
+to change its working directory, for example).
 
 @menu
 * MAKE Variable::               The special effects of using @samp{$(MAKE)}.
@@ -9726,6 +9730,18 @@ and concatenate the results.@*
 Evaluate the variable @var{var} replacing any references to @code{$(1)},
 @code{$(2)} with the first, second, etc. @var{param} values.@*
 @xref{Call Function, ,The @code{call} Function}.
+
+@item $(eval @var{text})
+
+Evaluate @var{text} then read the results as makefile commands.
+Expands to the empty string.@*
+@xref{Eval Function, ,The @code{eval} Function}.
+
+@item $(value @var{var})
+
+Evaluates to the contents of the variable @var{var}, with no expansion
+performed on it.@*
+@xref{Value Function, ,The @code{value} Function}.
 @end table
 
 Here is a summary of the automatic variables.