* doc/automake.texi (Alternative): Show how to rewrite nobase_

variables using custom directory variables, and link to node
Uniform.  Suggested by Leonardo Boiko.

diff --git a/ChangeLog b/ChangeLog
index 7f0f5fa78b4e2632213b109df466973180e13a73..127317fea1f942a7cf674f37fdd61bae9bf72d8e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-02-26  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * doc/automake.texi (Alternative): Show how to rewrite nobase_
+       variables using custom directory variables, and link to node
+       Uniform.  Suggested by Leonardo Boiko.
+
        * doc/automake.texi (Flag Variables Ordering, User Variables):
        Make clearer who the maintainer is, and that he can AC_SUBST AM_
        variables in configure.ac.  Suggested by Norman Gray.

diff --git a/THANKS b/THANKS
index 973b3973492d2433865252f047b26501b569a984..a839134cbaca25747541318a300f2f4ae12453c5 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -137,6 +137,7 @@ Lars Hecking                lhecking@nmrc.ucc.ie
 Lars J. Aas            larsa@sim.no
 Laurent Morichetti     laurentm@cup.hp.com
 Leo Davis              ldavis@fonix.com
+Leonardo Boiko         leoboiko@conectiva.com.br
 Loulou Pouchet         loulou@lrde.epita.fr
 Maciej Stachowiak      mstachow@mit.edu
 Maciej W. Rozycki      macro@ds2.pg.gda.pl

diff --git a/doc/automake.texi b/doc/automake.texi
index 43c6dd1254ee927d50439fea962161a26ead0d8f..8a0afce9a9af92102ce3ae4783b0d39427e6af2a 100644 (file)
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -2873,9 +2873,24 @@ nobase_include_HEADERS = sys/types.h
 either @samp{dist_} or @samp{nodist_} (@pxref{Dist}).  For instance:
 
 @example
-nobase_dist_pkgdata_DATA = images/vortex.pgm
+nobase_dist_pkgdata_DATA = images/vortex.pgm sounds/whirl.ogg
 @end example
 
+Finally, note that a variable using the @samp{nobase_} prefix can
+always be replaced by several variables, one for each destination
+directory (@pxref{Uniform}).  For instance the last example could be
+rewritten as follows.
+
+@example
+imagesdir = $(pkgdatadir)/images
+soundsdir = $(pkgdatadir)/sounds
+dist_images_DATA = images/vortex.pgm
+dist_sounds_DATA = sounds/whirl.ogg
+@end example
+
+@noindent
+This latter syntax makes it possible to change one destination
+directory without changing the layout of the source tree.
 
 @node Subpackages
 @section Nesting Packages