Once the `make check' finished, I'll check this in:
Index: ChangeLog
from Akim Demaille <[EMAIL PROTECTED]>
* automake.in (handle_texinfo): Use &transform, and transform
CONFIGURE_AC.
Reported by Lars Hecking, and diagnosed by Raja R Harinath.
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.818
diff -u -u -r1.818 automake.in
--- automake.in 2001/01/16 13:31:54 1.818
+++ automake.in 2001/01/18 17:15:57
@@ -2276,10 +2276,11 @@
($conf_pat = $conf_dir) =~ s/(\W)/\\$1/g;
$output_rules .=
&file_contents_with_transform
- ('s/\@TEXI\@/' . $info_cursor . '/g; '
- . 's/\@VTI\@/' . $vti . '/g; '
- . 's/\@VTEXI\@/' . $vtexi . '/g;'
- . 's,\@MDDIR\@,' . $conf_pat . ',g;',
+ (&transform ('TEXI' => $info_cursor,
+ 'VTI' => $vti,
+ 'VTEXI' => $vtexi,
+ 'MDDIR' => $conf_pat,
+ 'CONFIGURE_AC' => $configure_ac),
'texi-vers');
&push_phony_cleaners ($vti);
@@ -3325,7 +3326,7 @@
}
else
{
- local ($xform) = &transform ("CONFIGURE_AC" => $configure_ac);
+ local ($xform) = &transform ('CONFIGURE_AC' => $configure_ac);
&handle_aclocal_m4;
$output_rules .= &file_contents_with_transform ($xform,
'remake');
Lars, thanks for your perseverance, and Raja, thanks for helping me.
I think it's time I stop.
PS: After this patch:
~/src/am % touch Makefile.am nostromo 18:15
~/src/am % make nostromo 18:15
cd . && /home/lrde/prof/akim/src/am/automake --amdir=. --gnits Makefile
cd . \
&& CONFIG_FILES=Makefile CONFIG_HEADERS= /bin/sh ./config.status
creating Makefile
Making all in .
make[1]: Entre dans le répertoire `/mnt/nostromo/home/lrde/prof/akim/src/am'
make[1]: Rien à faire pour `all-am'.
make[1]: Quitte le répertoire `/mnt/nostromo/home/lrde/prof/akim/src/am'
Making all in m4
make[1]: Entre dans le répertoire `/mnt/nostromo/home/lrde/prof/akim/src/am/m4'
make[1]: Rien à faire pour `all'.
make[1]: Quitte le répertoire `/mnt/nostromo/home/lrde/prof/akim/src/am/m4'
Making all in tests
make[1]: Entre dans le répertoire `/mnt/nostromo/home/lrde/prof/akim/src/am/tests'
make[1]: Rien à faire pour `all'.
make[1]: Quitte le répertoire `/mnt/nostromo/home/lrde/prof/akim/src/am/tests'
