1.1 --- a/scripts/addToolVersion.sh	Sun Aug 02 23:33:38 2009 +0200
     1.2 +++ b/scripts/addToolVersion.sh	Sun Sep 13 18:38:06 2009 +0200
     1.3 @@ -78,34 +78,34 @@
     1.4      case "${EXP},${OBS}" in
     1.5          ,)  ;;
     1.6          ,*) exp_obs_prompt="  (OBSOLETE)"
     1.7 -            deps="    depends on OBSOLETE\n"
     1.8 +            deps="    depends on OBSOLETE"
     1.9              ;;
    1.10          *,) exp_obs_prompt="  (EXPERIMENTAL)"
    1.11 -            deps="    depends on EXPERIMENTAL\n"
    1.12 +            deps="    depends on EXPERIMENTAL"
    1.13              ;;
    1.14          *)  exp_obs_prompt="  (EXPERIMENTAL, OBSOLETE)"
    1.15 -            deps="    depends on EXPERIMENTAL && OBSOLETE\n"
    1.16 +            deps="    depends on EXPERIMENTAL \\&\\& OBSOLETE"
    1.17              ;;
    1.18      esac
    1.19      [ -n "${exp_obs_prompt}" ] && SedExpr1="${SedExpr1}${exp_obs_prompt}"
    1.20 -    SedExpr1="${SedExpr1}\"\n"
    1.21 -    [ -n "${deps}" ] && SedExpr1="${SedExpr1}${deps}"
    1.22 +    SedExpr1="${SedExpr1}\""
    1.23 +    [ -n "${deps}" ] && SedExpr1="${SedExpr1}\n${deps}"
    1.24      if [ "${tool}" = "gcc" ]; then
    1.25          # Extract 'M'ajor and 'm'inor from version string
    1.26          ver_M=$(echo "${version}...." |cut -d . -f 1)
    1.27          ver_m=$(echo "${version}...." |cut -d . -f 2)
    1.28          if [    ${ver_M} -gt 4                          \
    1.29               -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 3 \)  ]; then
    1.30 -            SedExpr1="${SedExpr1}    select CC_GCC_4_3_or_later\n"
    1.31 +            SedExpr1="${SedExpr1}\n    select CC_GCC_4_3_or_later"
    1.32          fi
    1.33          if [    ${ver_M} -gt 4                          \
    1.34               -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 4 \)  ]; then
    1.35 -            SedExpr1="${SedExpr1}    select CC_GCC_4_4_or_later\n"
    1.36 +            SedExpr1="${SedExpr1}\n    select CC_GCC_4_4_or_later"
    1.37          fi
    1.38      fi
    1.39      SedExpr2="    default \"${version}\" if ${cat}_V_${v}"
    1.40 -    "${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_ABOVE)$/'"${SedExpr1}"'\n\1/;' "${file}"
    1.41 -    "${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_STRING_ABOVE)$/'"${SedExpr2}"'\n\1/;' "${file}"
    1.42 +    "${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_BELOW)$/\1\n'"${SedExpr1}"'/;' "${file}"
    1.43 +    "${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_STRING_BELOW)$/\1\n'"${SedExpr2}"'/;' "${file}"
    1.44  }
    1.45  
    1.46  cat=