* 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.

diff --git a/ChangeLog b/ChangeLog
index a92281e..4b146b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-26  Akim Demaille  <akim@epita.fr>
+
+       * 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.
+
 2001-01-24  Akim Demaille  <akim@epita.fr>
 
        * m4/depend.m4 (AM_DEPENDENCIES): Don't leave `AC_PROG_CC' etc. in

diff --git a/automake.in b/automake.in
index 8bbfc66..6907d31 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -6,7 +6,7 @@ eval 'exec @PERL@ -S $0 ${1+"$@"}'
     if 0;
 
 # automake - create Makefile.in from Makefile.am
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -2263,7 +2263,7 @@ sub handle_texinfo
            &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 @@ sub handle_texinfo
                $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');
 

diff --git a/tests/ChangeLog b/tests/ChangeLog
index b836f37..c5f3a90 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,8 @@
 2001-01-26  Akim Demaille  <akim@epita.fr>
 
+       * vtexi.test (info_TEXINFOS): Check that the path to mdate-sh is
+       already correct.
+
        * defs (AUTOCONF, has_autoconf, needs_autoconf): New.
        * ansi3.test, cond9.test, depacl2.test, install2.test, pr19.test,
        * pr87.test, pr9.test, subobj3.test, target-cflags.test: Use them.

diff --git a/tests/vtexi.test b/tests/vtexi.test
index 8676206..afe5f8d 100755 (executable)
--- a/tests/vtexi.test
+++ b/tests/vtexi.test
@@ -28,9 +28,21 @@ $AUTOMAKE
 
 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