From: Pavel Roskin Date: Mon, 14 May 2001 16:15:03 +0000 (+0000) Subject: * automake.in ($IGNORE_PATTERN): Allow spaces before comments X-Git-Tag: Release-1-4f~27 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1582434290688d8b87a3081ce49f0dab346179ca;p=thirdparty%2Fautomake.git * automake.in ($IGNORE_PATTERN): Allow spaces before comments beginning with `##'. * automake.texi (General Operation): Document it. --- diff --git a/ChangeLog b/ChangeLog index 5f121c03c..4eae378ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-05-13 Pavel Roskin + + * automake.in ($IGNORE_PATTERN): Allow spaces before comments + beginning with `##'. + * automake.texi (General Operation): Document it. + 2001-05-13 Tom Tromey Reported by Rainer Orth: diff --git a/automake.in b/automake.in index 2d385b3b9..a1627ff09 100755 --- a/automake.in +++ b/automake.in @@ -110,7 +110,7 @@ my $prefix = "@prefix@"; my $libdir = "@datadir@/@PACKAGE@"; # String constants. -my $IGNORE_PATTERN = '^##([^#\n].*)?\n'; +my $IGNORE_PATTERN = '^\s*##([^#\n].*)?\n'; my $WHITE_PATTERN = '^\s*$'; my $COMMENT_PATTERN = '^#'; my $TARGET_PATTERN='[$a-zA-Z_.][-.a-zA-Z0-9_(){}/$]*'; diff --git a/automake.texi b/automake.texi index 89faa18ca..e655cbb00 100644 --- a/automake.texi +++ b/automake.texi @@ -271,8 +271,8 @@ contents of @code{foo_SOURCES}. @cindex Comment, special to Automake Automake also allows a form of comment which is @emph{not} copied into -the output; all lines beginning with @samp{##} are completely ignored by -Automake. +the output; all lines beginning with @samp{##} (leading spaces allowed) +are completely ignored by Automake. It is customary to make the first line of @file{Makefile.am} read: diff --git a/stamp-vti b/stamp-vti index 1644b3aa4..0f1c4f804 100644 --- a/stamp-vti +++ b/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 13 May 2001 +@set UPDATED 14 May 2001 @set UPDATED-MONTH May 2001 @set EDITION 1.4e @set VERSION 1.4e diff --git a/version.texi b/version.texi index 1644b3aa4..0f1c4f804 100644 --- a/version.texi +++ b/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 13 May 2001 +@set UPDATED 14 May 2001 @set UPDATED-MONTH May 2001 @set EDITION 1.4e @set VERSION 1.4e