diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-13 12:30:24 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-13 12:30:24 +0000 |
| commit | f28ec8da8c08a90b19c85ceef0ee717c886d7841 (patch) | |
| tree | 3c8bdc0399b48ae990c2164bcaab4d567b7e66a8 | |
| parent | e6226e2c9d6baafd4ba3efbdd0464ce28c3b2b0d (diff) | |
no alternate value expansion
* configure.in (opt-dir), tool/ifchange: get rid of "alternate value"
expansion for legacy sh. [ruby-dev:47420] [Bug #8524]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41280 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rwxr-xr-x | tool/ifchange | 3 |
3 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Thu Jun 13 21:30:14 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (opt-dir), tool/ifchange: get rid of "alternate value" + expansion for legacy sh. [ruby-dev:47420] [Bug #8524] + Thu Jun 13 21:24:09 2013 Tanaka Akira <akr@fsij.org> * bignum.c (bigdivrem): Refactored to use ALLOCV_N for temporary diff --git a/configure.in b/configure.in index 2aea00a169..3b17c0fc37 100644 --- a/configure.in +++ b/configure.in @@ -2625,8 +2625,10 @@ AC_ARG_WITH(opt-dir, sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${dir}/lib${IFS}g;s${IFS}%s${IFS}${dir}/lib${IFS}g" done | tr '\012' ' '` LDFLAGS_OPTDIR="$val" - LDFLAGS="$LDFLAGS${LDFLAGS:+ }$val" - DLDFLAGS="$DLDFLAGS${DLDFLAGS:+ }$val" + test x"${LDFLAGS}" = x || LDFLAGS="$LDFLAGS " + LDFLAGS="$LDFLAGS$val" + test x"${DLDFLAGS}" = x || DLDFLAGS="$DLDFLAGS " + DLDFLAGS="$DLDFLAGS$val" ]) AS_CASE(["$target_cpu-$target_os"], diff --git a/tool/ifchange b/tool/ifchange index 5ff8276b03..c54b8fbb03 100755 --- a/tool/ifchange +++ b/tool/ifchange @@ -1,6 +1,7 @@ #!/bin/sh # usage: ifchange target temporary +set -e timestamp= keepsuffix= until [ "$0" = 0 ]; do @@ -37,7 +38,7 @@ if cmp "$target" "$temp" >/dev/null 2>&1; then rm -f "$temp" else echo "$target updated" - ${keepsuffix:+ mv -f "$target" "${target}${keepsuffix}" } + [ x"${keepsuffix}" = x ] || mv -f "$target" "${target}${keepsuffix}" mv -f "$temp" "$target" fi |