From: Bruno Haible Date: Sat, 4 Sep 2010 13:28:09 +0000 (+0200) Subject: Doc update. X-Git-Tag: v0.1~3850 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=c45deef3be60127b0e3e99791464d58929a3b23e;p=gnulib.git Doc update. --- diff --git a/ChangeLog b/ChangeLog index 501b68697..872879205 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2010-09-04 Bruno Haible + * doc/gnulib-tool.texi (Initial import): Update paragraph about + separate gnulib.mk. + +2010-09-04 Bruno Haible + gnulib-tool: Don't talk about CVS any more. * gnulib-tool (func_usage, func_import): Write "version control" instead of CVS. diff --git a/doc/gnulib-tool.texi b/doc/gnulib-tool.texi index 02bb89a39..e9c376e4a 100644 --- a/doc/gnulib-tool.texi +++ b/doc/gnulib-tool.texi @@ -145,7 +145,7 @@ Don't forget to By default, the source code is copied into @file{lib/} and the M4 macros in @file{m4/}. You can override these paths by using @code{--source-base=DIRECTORY} and @code{--m4-base=DIRECTORY}. Some -modules also provide other files necessary for building. These files +modules also provide other files necessary for building. These files are copied into the directory specified by @samp{AC_CONFIG_AUX_DIR} in @file{configure.ac} or by the @code{--aux-dir=DIRECTORY} option. If neither is specified, the current directory is assumed. @@ -161,11 +161,11 @@ mechanism the maintainer applies to the sources. For these reasons, this option is generally discouraged. @code{gnulib-tool} will overwrite any pre-existing files, in -particular @file{Makefile.am}. Unfortunately, separating the +particular @file{Makefile.am}. It is also possible to separate the generated @file{Makefile.am} content (for building the gnulib library) -into a separate file, say @file{gnulib.mk}, that could be included -by your handwritten @file{Makefile.am} is not possible, due to how -variable assignments are handled by Automake. +into a separate file, say @file{gnulib.mk}, that can be included by your +handwritten @file{Makefile.am}, but this is a more advanced use of +@code{gnulib-tool}. Consequently, it is a good idea to choose directories that are not already used by your projects, to separate gnulib imported files from