Mercurial > hg > octave-lojdl > gnulib-hg
changeset 10400:817f1418bbde
Make gnulib-tool work with native 'sed' on AIX.
author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> |
---|---|
date | Fri, 05 Sep 2008 01:07:02 +0200 |
parents | d409a1cc4085 |
children | 4881ac7042cf |
files | ChangeLog gnulib-tool |
diffstat | 2 files changed, 20 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-09-04 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + Bruno Haible <bruno@clisp.org> + + Make gnulib-tool work with native 'sed' on AIX. + * gnulib-tool (sed_noop): New variable. + (func_emit_lib_Makefile_am, func_emit_tests_Makefile_am, func_import, + func_add_or_update, func_create_testdir): Use it to initialize sed + script variables. + Reported by Albert Chin <bug-gnulib@mlists.thewrittenword.com>. + 2008-09-04 Albert Chin <bug-gnulib@mlists.thewrittenword.com> Bruno Haible <bruno@clisp.org>
--- a/gnulib-tool +++ b/gnulib-tool @@ -83,6 +83,10 @@ alias sed='sed --posix' fi +# sed_noop is a sed expression that does nothing. +# An empty expression does not with the native 'sed' on AIX 6.1. +sed_noop='s,x,x,' + # func_usage # outputs to stdout the --help usage message. func_usage () @@ -1672,7 +1676,7 @@ if test "$libtool" = true; then libext=la perhapsLT=LT - sed_eliminate_LDFLAGS= + sed_eliminate_LDFLAGS="$sed_noop" else libext=a perhapsLT= @@ -1685,7 +1689,7 @@ # situation. Turn check_PROGRAMS into noinst_PROGRAMS. sed_transform_check_PROGRAMS='s,check_PROGRAMS,noinst_PROGRAMS,g' else - sed_transform_check_PROGRAMS= + sed_transform_check_PROGRAMS="$sed_noop" fi echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!" echo "## Process this file with automake to produce Makefile.in." @@ -1897,7 +1901,7 @@ { if test "$libtool" = true; then libext=la - sed_eliminate_LDFLAGS= + sed_eliminate_LDFLAGS="$sed_noop" else libext=a sed_eliminate_LDFLAGS='/^lib_LDFLAGS[ ]*+=/d' @@ -1909,7 +1913,7 @@ # situation. Turn check_PROGRAMS into noinst_PROGRAMS. sed_transform_check_PROGRAMS='s,check_PROGRAMS,noinst_PROGRAMS,g' else - sed_transform_check_PROGRAMS= + sed_transform_check_PROGRAMS="$sed_noop" fi testsbase_inverse=`echo "$testsbase" | sed -e 's,/$,,' | sed -e 's,[^/][^/]*,..,g'` echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!" @@ -3153,7 +3157,7 @@ ba }' else - sed_replace_build_aux= + sed_replace_build_aux="$sed_noop" fi func_emit_initmacro_start $macro_prefix echo " gl_source_base='$sourcebase'" @@ -3830,7 +3834,7 @@ ba }' else - sed_replace_build_aux= + sed_replace_build_aux="$sed_noop" fi func_emit_initmacro_start $macro_prefix echo "gl_source_base='$sourcebase'"