Re: FYI: fix sed syntax

[Peter Ekberg]

On Sat, Jan 21, 2006 at 05:45:44PM +0100, Ralf Wildenhues wrote:
> See here for the rationale to this largish patch:
> http://article.gmane.org/gmane.comp.sysutils.autoconf.patches/2649
> 
> Applied to HEAD (the corresponding branch-1-5 patch will appear in a
> followup post).  Gary, could you push the mailnotify/clcommit changes
> upstream?  Thank you.
> 
> Cheers,
> Ralf
> 
>       * bootstrap: Don't use semicolons inside { } in sed scripts, as
>       Posix says it's not portable.
>       * Makefile.am (libltdl/Makefile.am): Likewise.
>       * libtoolize.m4sh (all over the map): Likewise.
>       * libltdl/config/getopt.m4sh (func_version, func_usage)
>       (func_help): Likewise.
>       * libltdl/config/ltmain.m4sh (func_win32_libid): Likewise.
>       * libltdl/m4/libtool.m4 (_LT_SYS_MODULE_PATH_AIX): Likewise.
>       * clcommit.m4sh, libltdl/config/mailnotify.m4sh: Likewise.
>       * tests/sh.test, tests/testsuite.at (LT_AT_TAG): Likewise.
>       Noted by Paul Eggert <address@hidden>.

*snip*

> Index: Makefile.am
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/Makefile.am,v
> retrieving revision 1.185
> diff -u -r1.185 Makefile.am
> --- Makefile.am       3 Jan 2006 14:02:19 -0000       1.185
> +++ Makefile.am       21 Jan 2006 10:31:34 -0000
> @@ -214,9 +214,9 @@
>         echo 'CLEANFILES ='; \
>         echo 'MOSTLYCLEANFILES ='; \
>       } >> $$out; \
> -     $(SED) -n '/^.. DO NOT REMOVE THIS LINE -- /,$$ \
> -         { s,libltdl_,,; s,libltdl/,,; s,: libltdl/,: ,; \
> -           s,\$$(libltdl_,$$(,; p; }' $$in >> $$out;
> +     $(SED) -n '/^.. DO NOT REMOVE THIS LINE -- /,$$p' | \
> +     $(SED) -e 's,libltdl_,,; s,libltdl/,,; s,: libltdl/,: ,' \
> +            -e 's,\$$(libltdl_,$$(,' $$in >> $$out;
>       chmod a-w $(srcdir)/libltdl/Makefile.am
>  
>  $(srcdir)/libltdl/Makefile.in: $(srcdir)/libltdl/Makefile.am \

*snap*

Hi!

This hunk is broken, I think $$in should be stdin of the first $(SED), not an
argument of the second. As is, bootstrap hangs waiting for user input. I had
to hit ^D to get it going, but that didn't work in the end of course. :-)

Patch attached which shows what I mean.

Cheers,
Peter

head-bootstrap-sed-fixup.patch
Description: Text document