Re: FYI: s/autoconf/$AUTOCONF/g in test suite

[Akim Demaille]

| Ooops!  I just noticed this in my patch:
| 
| | Index: Makefile.in
| | ===================================================================
| | RCS file: /cvs/automake/automake/Makefile.in,v
| | retrieving revision 1.243
| | diff -u -u -r1.243 Makefile.in
| | --- Makefile.in 2001/01/25 15:50:36 1.243
| | +++ Makefile.in 2001/01/26 14:17:22
| | @@ -178,7 +178,7 @@
| |         @:
| |  
| |  $(srcdir)/stamp-vti: automake.texi $(top_srcdir)/configure.in
| | -   @(set `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/automake.texi`; \
| | +   @(set `$(SHELL) \$\(srcdir\)\/mdate-sh $(srcdir)/automake.texi`; \
| |         echo "@set UPDATED $$1 $$2 $$3"; \
| |         echo "@set UPDATED-MONTH $$2 $$3"; \
| |         echo "@set EDITION $(VERSION)"; \
| 
| I'm not applying it, but Tom, something's fishy here.  I guess it the
| quotation in &transform that made this.

I'm applying this:

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * automake.in (handle_texinfo): Don't use $conf_pat, just
        $conf_dir to transform MDDIR since now &transform handles the
        escaping of RE special characters by itself.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.822
diff -u -u -r1.822 automake.in
--- automake.in 2001/01/25 03:28:51 1.822
+++ automake.in 2001/01/26 15:01:25
@@ -2263,7 +2263,7 @@
            &require_conf_file_with_line ('info_TEXINFOS', $FOREIGN,
                                          'mdate-sh');
 
-           local ($conf_pat, $conf_dir);
+           local ($conf_dir);
            if ($config_aux_dir eq '.' || $config_aux_dir eq '')
            {
                $conf_dir = '$(srcdir)/';
@@ -2273,13 +2273,12 @@
                $conf_dir = $config_aux_dir;
                $conf_dir .= '/' unless $conf_dir =~ /\/$/;
            }
-           ($conf_pat = $conf_dir) =~ s/(\W)/\\$1/g;
            $output_rules .=
                &file_contents_with_transform
                    (&transform ('TEXI'         => $info_cursor,
                                 'VTI'          => $vti,
                                 'VTEXI'        => $vtexi,
-                                'MDDIR'        => $conf_pat,
+                                'MDDIR'        => $conf_dir,
                                 'CONFIGURE_AC' => $configure_ac),
                     'texi-vers');
 
Index: tests/ChangeLog
from  Akim Demaille  <address@hidden>
        * vtexi.test (info_TEXINFOS): Check that the path to mdate-sh is
        already correct.

Index: tests/vtexi.test
===================================================================
RCS file: /cvs/automake/automake/tests/vtexi.test,v
retrieving revision 1.7
diff -u -u -r1.7 vtexi.test
--- tests/vtexi.test 2001/01/24 14:40:41 1.7
+++ tests/vtexi.test 2001/01/26 15:01:48
@@ -28,9 +28,21 @@
 
 grep '^textutils\.info: textutils\.texi .*version\.texi$' Makefile.in
 
+
 # Test for bug reported by Lars Hecking:
 # When running the first version of configure.ac aware automake,
 # @CONFIGURE_AC@ was not properly substitued.
 
 egrep '^\$\(srcdir\)/stamp-vti:.*textutils\.texi( .*)?$' Makefile.in
 egrep '^\$\(srcdir\)/stamp-vti:.*\$\(top_srcdir\)/configure\.in( .*)?$' 
Makefile.in
+
+
+# Check that the path to mdate-sh is correct.  Over escaping of `$'
+# etc. once led to `\$\(srcdir\)/mdate-sh'.
+
+# Filter out '$(srcdir)/mdate-sh'; output occurrences of `SOMETHING/mdate-sh'
+sed -n 's,\$(srcdir)/mdate-sh,,g;s,.* \([^ ]*/mdate-sh\) .*,\1,gp' Makefile.in|
+# There must remain nothing.
+ grep . && exit 1
+
+exit 0