* automake.texi (Canonicalizing Automake macros): Document not

canonicalizing strudels (@) anymore.

diff --git a/ChangeLog b/ChangeLog
index 27421e14eaa21d5da7c725e0a5636e3290df07c3..08c1b67eb66c7d7364edec06134954c4867b2050 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-08  Lars J. Aas  <larsa@sim.no>
+
+       * automake.texi (Canonicalizing Automake macros): Document not
+       canonicalizing strudels (@) anymore.
+
 2001-05-08  Akim Demaille  <akim@epita.fr>
 
        * distdir.am (dist-all): Build all the flavors using a single
@@ -42,7 +47,6 @@
        (&lang_java_finish): Remove.
        (&lang_ppf77_finish, &lang_ratfor_finish): Adjust.
 
-       
 2001-05-08  Akim Demaille  <akim@epita.fr>
 
        * automake.in (&file_contents_internal): Accept $IS_AM.
@@ -2151,7 +2155,7 @@
        * tests/pr87.test: Added check for blank line after `.c.o' rule.
        Report from Lars J. Aas.
 
-2001-02-07  Lars J. Aas <larsa@sim.no>
+2001-02-07  Lars J. Aas  <larsa@sim.no>
 
        * lisp.am (install-@DIR@LISP): Removed extra space.
        * header.am (install-@DIR@HEADERS): Removed extra space.
@@ -2288,7 +2292,7 @@
        * automake.in (handle_dist_worker): Remove a line that is now
        in distdir.am.
 
-2001-02-04  Kevin Ryde <user42@zip.com.au>
+2001-02-04  Kevin Ryde  <user42@zip.com.au>
 
        * automake.in (handle_configure): Call config.status with empty
        CONFIG_LINKS and CONFIG_COMMANDS when regenerating a file.
@@ -2335,7 +2339,7 @@
        * automake.in (handle_dependencies): Switched the DEP_FILES
        definition to be conditional on @AMDEP@.
 
-2001-02-03  Ville Laurikari <vlaurika@hutcs.cs.hut.fi>
+2001-02-03  Ville Laurikari  <vlaurika@hutcs.cs.hut.fi>
 
        * depcomp (aix): New side-effect dependency tracking mode, for
        the C for AIX compiler.
@@ -2362,7 +2366,7 @@
        (handle_dist_worker): Use global dist_dirs.
        (handle_configure): Set dist_dirs entries at toplevel.
 
-2001-02-02  Gordon Sadler <gbsadler1@lcisp.com>
+2001-02-02  Gordon Sadler  <gbsadler1@lcisp.com>
 
        * automake.texi (Java Support): Added index, @section.
 
@@ -2601,7 +2605,7 @@
        or AC_SUBSTs.
        (add_file): Likewise.
 
-2001-01-13  Kevin Ryde <user42@zip.com.au>
+2001-01-13  Kevin Ryde  <user42@zip.com.au>
 
        * automake.in (handle_ltlibraries): Omit -rpath from
        check_LTLIBRARIES, as per noinst_LTLIBRARIES.
@@ -2653,12 +2657,12 @@
        * automake.in (libtoolize_files): Removed ltconfig.
        (initialize_global_constants): Added ltconfig to common_files.
 
-2000-12-21  Kevin Ryde <user42@zip.com.au>
+2000-12-21  Kevin Ryde  <user42@zip.com.au>
 
        * automake.in (handle_footer): Generate .SUFFIXES target when user
        defines suffixes but automake does not.
 
-2000-12-20  Marc Espie <espie@openbsd.org>
+2000-12-20  Marc Espie  <espie@openbsd.org>
 
        * automake.in (handle_texinfo): Make path of $vtexi explicit in
        dependency.
@@ -2752,7 +2756,7 @@
        * aclocal.in (write_aclocal): Set up aclocal.m4 header with
        normal comments (#) instead of m4 dnl-type comments.
 
-2000-10-17  Alex Hornby <alex@anvil.com>
+2000-10-17  Alex Hornby  <alex@anvil.com>
 
        * depcomp: Altered sed clause to strip of inclusion depth
        numbers generated by cpp. Also output in gcc style.
@@ -2852,7 +2856,7 @@
        configure variables that don't satisfy the other constraints.
        Fixes PR automake/68.
 
-2000-04-14  Victor V. Vengerov <vvv@oktet.ru>
+2000-04-14  Victor V. Vengerov  <vvv@oktet.ru>
 
        Fix for PR automake/67.
        * automake.in (handle_multilib): remove .am suffix in fragment
@@ -2919,7 +2923,7 @@
        * lisp.am (uninstall-@DIR@LISP): Prefix file with $(DESTDIR).
        From Bruno Haible.
 
-2000-07-13  Kevin Ryde <user42@zip.com.au>
+2000-07-13  Kevin Ryde  <user42@zip.com.au>
 
        * automake.in (am_install_var): Apply the $(EXEEXT) hack to
        EXTRA_PROGRAMS as well as other _PROGRAMS.

diff --git a/NEWS b/NEWS
index cbf7eba2771762abf2d4760a2a7c03284fa94fce..1f5d386823097fcc4db41b3c0225937066797c6f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ New in 1.4e:
 * Support for `configure.ac'.
 * Support for `else COND', `endif COND' and negated conditions `!COND'.
 * `make dist-all' is much faster.
+* Allows '@' AC_SUBSTs in macro names.
 
 New in 1.4b:
 * Faster AM_INIT_AUTOMAKE (requires update of `missing' script)

diff --git a/automake.texi b/automake.texi
index 9e7007d5abb3f030e4a6b7e5674a559f0f9d299b..caed4961bbb142be189764dc2483911793e35689 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -472,10 +472,12 @@ Sometimes a Makefile variable name is derived from some text the user
 supplies.  For instance, program names are rewritten into Makefile macro
 names.  Automake canonicalizes this text, so that it does not have to
 follow Makefile macro naming rules.  All characters in the name except
-for letters, numbers, and the underscore are turned into underscores
-when making macro references.  For example, if your program is named
-@code{sniff-glue}, the derived variable name would be
-@code{sniff_glue_SOURCES}, not @code{sniff-glue_SOURCES}.
+for letters, numbers, the strudel (@@), and the underscore are turned into
+underscores when making macro references.  For example, if your program
+is named @code{sniff-glue}, the derived variable name would be
+@code{sniff_glue_SOURCES}, not @code{sniff-glue_SOURCES}.  The strudel
+is an addition since Automake 1.4c, to make the use of Autoconf
+substitutions in macro names less obfuscating.
 
 
 @node User Variables, , Canonicalization, Generalities

diff --git a/stamp-vti b/stamp-vti
index b5618f1c91fe557dbeab590d37ff5592e728448c..de4a0f4d2f8f36a68e1e64cf680b66741f942164 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 6 May 2001
+@set UPDATED 8 May 2001
 @set UPDATED-MONTH May 2001
 @set EDITION 1.4e
 @set VERSION 1.4e

diff --git a/version.texi b/version.texi
index b5618f1c91fe557dbeab590d37ff5592e728448c..de4a0f4d2f8f36a68e1e64cf680b66741f942164 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 6 May 2001
+@set UPDATED 8 May 2001
 @set UPDATED-MONTH May 2001
 @set EDITION 1.4e
 @set VERSION 1.4e