summaryrefslogtreecommitdiff
path: root/doc/automake.texi
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2012-12-09 21:55:32 +0100
committerStefano Lattarini <stefano.lattarini@gmail.com>2012-12-09 21:55:32 +0100
commitd7a59576910338592410afd23bb726348fa59000 (patch)
tree03c6ced8a87510e777815d916c35c1b6549e8eec /doc/automake.texi
parent6a38d7404f561cf4fd6494b3b243eae89951c947 (diff)
parent319ae3dd47bddff0dbe4da2dca87f50d5347108c (diff)
downloadautomake-d7a59576910338592410afd23bb726348fa59000.tar.gz
Merge branch 'maint'
* maint: docs: AM_CFLAGS: remove reference to non-existing "more detailed" desc maintcheck: prefer '$(am__cd)' over plain 'cd' fetch: improve, and reduce code duplication docs: add rule to generate manuals for www.gnu.org docs: copy the 'gendocs.sh' script from Texinfo CVS repository sync: update files from upstream with "make fetch" release: generate a stub for the release announcement release: distinguish major and minor releases tests: avoid two spurious failures on FreeBSD
Diffstat (limited to 'doc/automake.texi')
-rw-r--r--doc/automake.texi6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/automake.texi b/doc/automake.texi
index c0b1abf79..1c96940f3 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -6128,9 +6128,9 @@ same functionality. This variable is deprecated; we suggest using
@item AM_CFLAGS
This is the variable the @file{Makefile.am} author can use to pass
-in additional C compiler flags. It is more fully documented elsewhere.
-In some situations, this is not used, in preference to the
-per-executable (or per-library) @code{_CFLAGS}.
+in additional C compiler flags. In some situations, this is
+not used, in preference to the per-executable (or per-library)
+@code{_CFLAGS}.
@item COMPILE
This is the command used to actually compile a C source file. The