* doc/autoconf.texi (Defining Directories): Mention

AM_CPPFLAGS, as the way to modify CPPFLAGS when using Automake.

diff --git a/ChangeLog b/ChangeLog
index c1e9320ea0dbc74daf0c0db5669294bb560ff4bf..81cd5ad58a47260f74523f3e6be68ab055227599 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-22  Stepan Kasal  <kasal@ucw.cz>
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * doc/autoconf.texi (Defining Directories): Mention
+       AM_CPPFLAGS, as the way to modify CPPFLAGS when using Automake.
+
 2007-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * lib/autoconf/general.m4 (AC_SITE_LOAD): Do not overwrite "$@"

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index cb7345e4334a3bbeff782cf064ad75f3efa51a58..b4a961efe27ba74115b96c0ed32336d4b8118613 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -19170,11 +19170,18 @@ CPPFLAGS = -DDATADIR='"$(datadir)"' @@CPPFLAGS@@
 @end example
 
 @noindent
-or create a dedicated header file:
+If you are using Automake, you should use @code{AM_CPPFLAGS} instead:
 
 @example
-DISTCLEANFILES = datadir.h
-datadir.h: Makefile
+AM_CPPFLAGS = -DDATADIR='"$(datadir)"'
+@end example
+
+@noindent
+Alternatively, create a dedicated header file:
+
+@example
+DISTCLEANFILES = myprog-paths.h
+myprog-paths.h: Makefile
         echo '#define DATADIR "$(datadir)"' >$@@
 @end example