From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Wed, 16 Jun 2004 19:17:03 +0000 (+0000)
Subject: For Debian Bug#254372:
X-Git-Tag: Release-1-8d~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac1bc9092242de3e2e791a47bc87d48d841ea540;p=thirdparty%2Fautomake.git

For Debian Bug#254372:
* doc/automake.texi (Invoking aclocal): Rewrite the paragraph
explaining m4_include is used for relative files.
---

diff --git a/ChangeLog b/ChangeLog
index 2a010ea1c..0bbecc219 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-16  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	For Debian Bug#254372:
+	* doc/automake.texi (Invoking aclocal): Rewrite the paragraph
+	explaining m4_include is used for relative files.
+
 2004-06-10  Alexandre Duret-Lutz  <adl@gnu.org>
 
 	For Debian Bug #251820:
diff --git a/doc/automake.texi b/doc/automake.texi
index cdcd03d4e..b4a007b63 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -1505,16 +1505,18 @@ file, including unused macro definitions as well as both @samp{#} and
 completely ignored by @command{aclocal}, use @samp{##} as the comment
 leader.
 
-When @command{aclocal} detects that the file containing the macro
-definition is in a subdirectory of your package, it will use
-@code{m4_include} instead of copying it; this makes the package
-smaller and eases dependency tracking.  This only works if the
-subdirectory containing the macro was specified as a relative search
-path with @command{aclocal}'s @code{-I} argument.  (@pxref{Local
-Macros} for an example.)  Any macro which is found in a system-wide
-directory, or via an absolute search path will be copied.
-
-The contents of @file{acinclude.m4}, if it exists, are also
+When a file selected by @command{aclocal} is located in a subdirectory
+specified as a relative search path with @command{aclocal}'s @code{-I}
+argument, @command{aclocal} assumes the file belongs to the package
+and uses @code{m4_include} instead of copying it into
+@file{aclocal.m4}.  This makes the package smaller, eases dependency
+tracking, and cause the file to be distributed automatically.
+(@pxref{Local Macros} for an example.)  Any macro which is found in a
+system-wide directory, or via an absolute search path will be copied.
+So use @code{-I `pwd`/reldir} instead of @code{-I reldir} whenever
+some relative directory need to be considered outside the package.
+
+The contents of @file{acinclude.m4}, if this file exists, are also
 automatically included in @file{aclocal.m4}.  We recommend against
 using @file{acinclude.m4} in new packages (@pxref{Local Macros}).
 
diff --git a/doc/stamp-vti b/doc/stamp-vti
index 0c5955f6f..7a46574b9 100644
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 31 May 2004
-@set UPDATED-MONTH May 2004
+@set UPDATED 16 June 2004
+@set UPDATED-MONTH June 2004
 @set EDITION 1.8c
 @set VERSION 1.8c
diff --git a/doc/version.texi b/doc/version.texi
index 0c5955f6f..7a46574b9 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 31 May 2004
-@set UPDATED-MONTH May 2004
+@set UPDATED 16 June 2004
+@set UPDATED-MONTH June 2004
 @set EDITION 1.8c
 @set VERSION 1.8c