* automake.in (check_canonical_spelling): Insert AM before names

starting with non-letters.
* automake.texi: Document it.

diff --git a/ChangeLog b/ChangeLog
index 2415d29e71383cdc5eb84aa7ca4e7419f7cf6092..6fdf972f94f5aec91ffb4616081eac8bf30733d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-04-27  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * automake.in (check_canonical_spelling): Insert AM before names
+       starting with non-letters.
+       * automake.texi: Document it.
+
 1999-04-26  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
        * automake.in (handle_lib_objects_cond): Do not use quotemeta, it

diff --git a/automake.in b/automake.in
index d31244b839e1e60fbf138bda8256eea289a88976..ab1fbf425e4d724c13936e7fd892e23a25482664 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1502,6 +1502,7 @@ sub check_canonical_spelling
     local ($xname, $xt);
 
     ($xname = $name) =~ tr/A-Za-z0-9_/_/c;
+    $xname =~ s/^([0-9_])/AM\1/;
     if ($xname ne $name)
     {
        local ($xt);

diff --git a/automake.texi b/automake.texi
index dc37d1647d3c630e510ec5d3f219d5b250dd86ca..768e50c776b5f8506efe4d7d0a1c9ded11d0838e 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -502,6 +502,15 @@ 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}.
 
+Additionally, because some versions of make require macro names to start
+with a @emph{letter}, when a name that starts with a non-letter
+character is canonicalized, the characters @code{AM} are prepended to
+it.  Therefore, if a program is named @code{123test} or @code{_foo}, the
+derived variable names would be @code{AM123test_SOURCES} or
+@code{AM_foo_SOURCES}.  Note that, even if such a program name would not
+appear in the beginning of the name of the macro, @code{AM} is still
+inserted, i.e., use @code{EXTRA_AM123test_SOURCES}, not
+@code{EXTRA_123test_SOURCES}.
 
 @node Examples, Invoking Automake, Generalities, Top
 @chapter Some example packages

diff --git a/stamp-vti b/stamp-vti
index 3bbba9835f2c4ce5bb5e45523f605a562f3cb273..cdea05a73b5d163e5efc17edba9d88e78caf046a 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,3 +1,3 @@
-@set UPDATED 22 April 1999
+@set UPDATED 27 April 1999
 @set EDITION 1.4a
 @set VERSION 1.4a

diff --git a/version.texi b/version.texi
index 3bbba9835f2c4ce5bb5e45523f605a562f3cb273..cdea05a73b5d163e5efc17edba9d88e78caf046a 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 22 April 1999
+@set UPDATED 27 April 1999
 @set EDITION 1.4a
 @set VERSION 1.4a