]>
Commit | Line | Data |
---|---|---|
2cbd2e34 JB |
1 | --- ruby-2.0.0-p481/configure.in.orig 2014-08-29 20:47:53.036620911 +0200 |
2 | +++ ruby-2.0.0-p481/configure.in 2014-08-30 16:07:42.010367205 +0200 | |
3 | @@ -3241,37 +3241,37 @@ | |
4 | ||
5 | shvar_to_cpp() { | |
6 | var="$1" val="$2" | |
7 | - exec_prefix_pat="`echo \"${exec_prefix}\" | sed 's/\\./\\\\./g'`" | |
8 | - arch_pat="`echo \"${arch}\" | sed 's/\\./\\\\./g'`" | |
9 | - sitearch_pat="`echo \"${sitearch}\" | sed 's/\\./\\\\./g'`" | |
10 | - val="`echo '\"'\"${val}\"'\"' | | |
2e5b2795 JB |
11 | + exec_prefix_pat="$(echo "${exec_prefix}" | sed 's/\./\\./g')" |
12 | + arch_pat="$(echo "${arch}" | sed 's/\./\\./g')" | |
13 | + sitearch_pat="$(echo "${sitearch}" | sed 's/\./\\./g')" | |
2cbd2e34 JB |
14 | + val="$(echo '"'"${val}"'"' | |
15 | sed \ | |
16 | - -e 's/\${\([[A-Z][A-Z_]]*\)}/\"\1\"/g' \ | |
17 | - -e 's|\${sitearchlibdir}|'\"${sitearchlibdir}|g\" \ | |
18 | - -e 's|\${sitearchincludedir}|'\"${sitearchincludedir}|g\" \ | |
19 | - -e 's|\${archlibdir}|'\"${archlibdir}|g\" \ | |
20 | - -e 's|\${archincludedir}|'\"${archincludedir}|g\" \ | |
21 | - -e 's|\${libdir}|'\"${libdir}|g\" \ | |
22 | - -e 's/\${ruby_version}/\"RUBY_LIB_VERSION\"/g' \ | |
23 | - -e 's/\${arch}/\"arch\"/g' \ | |
24 | - -e 's/\${sitearch}/\"arch\"/g' \ | |
25 | - -e 's/\${vendorarchdir}/\"RUBY_VENDOR_ARCH_LIB\"/g' \ | |
26 | - -e 's/\${sitearchdir}/\"RUBY_SITE_ARCH_LIB\"/g' \ | |
27 | - -e 's/\${vendorlibdir}/\"RUBY_VENDOR_LIB2\"/g' \ | |
28 | - -e 's/\${sitelibdir}/\"RUBY_SITE_LIB2\"/g' \ | |
29 | - -e 's/\${vendordir}/\"RUBY_VENDOR_LIB\"/g' \ | |
30 | - -e 's/\${sitedir}/\"RUBY_SITE_LIB\"/g' \ | |
31 | - -e 's/\${rubylibdir}/\"RUBY_LIB\"/g' \ | |
32 | - -e 's/\${rubylibprefix}/\"RUBY_LIB_PREFIX\"/g' \ | |
33 | - -e 's/\${rubyarchprefix}/\"RUBY_ARCH_PREFIX_FOR(arch)\"/g' \ | |
34 | - -e 's/\${rubysitearchprefix}/\"RUBY_SITEARCH_PREFIX_FOR(arch)\"/g' \ | |
35 | - -e 's/\${exec_prefix}/\"RUBY_EXEC_PREFIX\"/g' \ | |
36 | - -e \"s|${exec_prefix_pat}/|\"'\"RUBY_EXEC_PREFIX\"/|g' \ | |
37 | - -e \"s|${arch_pat}|\"'\"arch\"|g' \ | |
38 | - -e \"s|${sitearch_pat}|\"'\"sitearch\"|g' \ | |
39 | - -e 's|^\\\"NONE/|RUBY_EXEC_PREFIX\\\"/|' \ | |
40 | - -e 's|^\\\"NONE\\\"|\\\"'\"${prefix}\"'\\\"|' \ | |
41 | - -e 's/^\\\"\\\"\(.\)/\1/;s/\(.\)\\\"\\\"$/\1/' | |
42 | - `" | |
43 | + -e 's/\${\([[A-Z][A-Z_]]*\)}/"\1"/g' \ | |
44 | + -e 's|\${sitearchlibdir}|'"${sitearchlibdir}|g" \ | |
45 | + -e 's|\${sitearchincludedir}|'"${sitearchincludedir}|g" \ | |
46 | + -e 's|\${archlibdir}|'"${archlibdir}|g" \ | |
47 | + -e 's|\${archincludedir}|'"${archincludedir}|g" \ | |
48 | + -e 's|\${libdir}|'"${libdir}|g" \ | |
49 | + -e 's/\${ruby_version}/"RUBY_LIB_VERSION"/g' \ | |
50 | + -e 's/\${arch}/"arch"/g' \ | |
51 | + -e 's/\${sitearch}/"arch"/g' \ | |
52 | + -e 's/\${vendorarchdir}/"RUBY_VENDOR_ARCH_LIB"/g' \ | |
53 | + -e 's/\${sitearchdir}/"RUBY_SITE_ARCH_LIB"/g' \ | |
54 | + -e 's/\${vendorlibdir}/"RUBY_VENDOR_LIB2"/g' \ | |
55 | + -e 's/\${sitelibdir}/"RUBY_SITE_LIB2"/g' \ | |
56 | + -e 's/\${vendordir}/"RUBY_VENDOR_LIB"/g' \ | |
57 | + -e 's/\${sitedir}/"RUBY_SITE_LIB"/g' \ | |
58 | + -e 's/\${rubylibdir}/"RUBY_LIB"/g' \ | |
59 | + -e 's/\${rubylibprefix}/"RUBY_LIB_PREFIX"/g' \ | |
60 | + -e 's/\${rubyarchprefix}/"RUBY_ARCH_PREFIX_FOR(arch)"/g' \ | |
61 | + -e 's/\${rubysitearchprefix}/"RUBY_SITEARCH_PREFIX_FOR(arch)"/g' \ | |
62 | + -e 's/\${exec_prefix}/"RUBY_EXEC_PREFIX"/g' \ | |
63 | + -e "s|${exec_prefix_pat}/|"'"RUBY_EXEC_PREFIX"/|g' \ | |
64 | + -e "s|${arch_pat}|"'"arch"|g' \ | |
65 | + -e "s|${sitearch_pat}|"'"sitearch"|g' \ | |
66 | + -e 's|^\\"NONE/|RUBY_EXEC_PREFIX\\"/|' \ | |
67 | + -e 's|^\\"NONE\\"|\\"'"${prefix}"'\\"|' \ | |
68 | + -e 's/^\\"\\"\(.\)/\1/;s/\(.\)\\"\\"$/\1/' | |
69 | + )" | |
70 | eval $var='"$val"' | |
71 | } | |
72 | @@ -3289,7 +3289,7 @@ | |
73 | fi | |
74 | done | |
75 | expr=['s/${[^${}"]*}/"&"/g;'"${expr};"'s/"\(\${[^${}"]*}\)"/\1/g'] | |
76 | - eval $var='"`echo \"\\\"${'$var'}\\\"\" | sed \"$expr;s/\\\"//g\"`"' | |
2e5b2795 | 77 | + eval $var='"$(echo "\"${'$var'}\"" | sed "$expr;s/\"//g")"' |
2cbd2e34 JB |
78 | } |
79 | ||
80 | rubylibprefix='${libdir}/${RUBY_BASE_NAME}' |