From: Bruno Haible <bruno@clisp.org>
Date: Mon, 1 Mar 2010 21:09:44 +0000 (+0100)
Subject: Doc clarification.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fc10daa05477586fea99b6b3ca02a87d1102fa1;p=pspp

Doc clarification.
---

diff --git a/ChangeLog b/ChangeLog
index 0c9e14f8d8..f7c7482f37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-01  Bruno Haible  <bruno@clisp.org>
+
+	* doc/gnulib-tool.texi (Initial import): Clarify the requirements
+	regarding Automake.
+
 2010-02-25  Bruno Haible  <bruno@clisp.org>
 
 	Fix breakage of gnulib-tool with ksh, introduced on 2010-02-21.
diff --git a/doc/gnulib-tool.texi b/doc/gnulib-tool.texi
index 9a597e172f..39081801c3 100644
--- a/doc/gnulib-tool.texi
+++ b/doc/gnulib-tool.texi
@@ -81,8 +81,14 @@ module that contains this source file, you can use the command
 @section Initial import
 @cindex initial import
 
-Gnulib assumes your project uses Autoconf and Automake.  Invoking
-@samp{gnulib-tool --import} will copy source files, create a
+Gnulib assumes that your project uses Autoconf.  When using Gnulib, you
+will need to have Autoconf and Automake among your build tools.  Note that
+while the use of Automake in your project's top level directory is an
+easy way to fulfil the Makefile conventions of the GNU coding standards,
+Gnulib does not require it.  But when you use Gnulib, Automake will be
+used at least in a subdirectory of your project.
+
+Invoking @samp{gnulib-tool --import} will copy source files, create a
 @file{Makefile.am} to build them, generate a file @file{gnulib-comp.m4} with
 Autoconf M4 macro declarations used by @file{configure.ac}, and generate
 a file @file{gnulib-cache.m4} containing the cached specification of how