summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2012-10-02 20:34:47 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2012-10-02 20:34:47 +0200
commit7411adcdad588acf2a167dd05e5a942fa752e90e (patch)
treec23c6cdd38990b3e7d0739a3e15b115131399a6f /doc
parent154fedbdbbc962f112989cc3c963daa4467b7618 (diff)
parentb8651afd8279a6eb86648b08579776eec368f8fb (diff)
downloadautomake-7411adcdad588acf2a167dd05e5a942fa752e90e.tar.gz
Merge branch 'maint'
* maint: config headers: remove stale comment in makefile fragment NEWS: wording and quoting fixlets in few older entries config headers: don't emit rules for headers not generated by autoheader docs: fix minor typo: s/expending/expanding/ sync: update files from upstream with "make fetch" maint: post-release minor version bump maint: typo fixes s/lies into/lies in/ release: stable release 1.12.4 NEWS: minor fix Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/automake.texi10
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/automake.texi b/doc/automake.texi
index 13db2c1c5..7058545ec 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -2956,9 +2956,11 @@ Automake will require the sources file declared with
macro.
@item AC_CONFIG_HEADERS
-Automake will generate rules to rebuild these headers. Older versions
-of Automake required the use of @code{AM_CONFIG_HEADER}; this is no
-longer the case, and that macro has indeed been removed.
+Automake will generate rules to rebuild these headers from the
+corresponding templates (usually, the template for a @file{foo.h}
+header being @file{foo.h.in}). Older versions of Automake
+required the use of @code{AM_CONFIG_HEADER}; this is no longer
+the case, and that macro has indeed been removed.
As with @code{AC_CONFIG_FILES} (@pxref{Requirements}), parts of the
specification using shell variables will be ignored as far as
@@ -11817,7 +11819,7 @@ Although @samp{$(wildcard ...)} works with GNU @command{make}, it is
not portable to other @command{make} implementations.
The only way Automake could support @command{$(wildcard ...)} is by
-expending @command{$(wildcard ...)} when @command{automake} is run.
+expanding @command{$(wildcard ...)} when @command{automake} is run.
The resulting @file{Makefile.in}s would be portable since they would
list all files and not use @samp{$(wildcard ...)}. However that
means developers would need to remember to run @command{automake} each