diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-23 15:02:43 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-23 15:02:43 -0700 |
| commit | ddd54c759aedbcabfb17335dab690ce79c5a53b4 (patch) | |
| tree | 0ed544a56358c56fdd465e19d2497bcb4315051b /gnulib-tool | |
| parent | cd756d0a82b95b0d16e2aa1b841ecb8ff35056b1 (diff) | |
| download | gnulib-ddd54c759aedbcabfb17335dab690ce79c5a53b4.tar.gz | |
gnulib-tool: fix portability problem with MacOS sed
A sed command like "/x/{s/a/b/}" is not portable; a newline is needed
before the "}". Problem reported by Leo in
<http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00717.html>.
* gnulib-tool (sed_dependencies_without_conditions):
Diffstat (limited to 'gnulib-tool')
| -rwxr-xr-x | gnulib-tool | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gnulib-tool b/gnulib-tool index f6c29f27e9..0bec3b3d5c 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -2694,8 +2694,12 @@ func_modules_transitive_closure () func_append inmodules " $dep" if test -n "$cond_dependencies"; then escaped_dep=`echo "$dep" | sed -e "$sed_escape_dependency"` - sed_extract_condition1='/^ *'"$escaped_dep"' *$/{s/^.*$/true/p}' - sed_extract_condition2='/^ *'"$escaped_dep"' *\[.*\] *$/{s/^ *'"$escaped_dep"' *\[\(.*\)\] *$/\1/p}' + sed_extract_condition1='/^ *'"$escaped_dep"' *$/{ + s/^.*$/true/p + }' + sed_extract_condition2='/^ *'"$escaped_dep"' *\[.*\] *$/{ + s/^ *'"$escaped_dep"' *\[\(.*\)\] *$/\1/p + }' condition=`func_get_dependencies $module | sed -n -e "$sed_extract_condition1" -e "$sed_extract_condition2"` if test "$condition" = true; then condition= |