diff options
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/yajl.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/brewkit.rb | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/Library/Formula/yajl.rb b/Library/Formula/yajl.rb index d90576009..189a1143a 100644 --- a/Library/Formula/yajl.rb +++ b/Library/Formula/yajl.rb @@ -13,7 +13,7 @@ class Yajl <Formula ENV.deparallelize # I have pushed this fix upstream - inreplace 'configure', 'cmake \.\.', "cmake -DCMAKE_INSTALL_PREFIX='#{prefix}' \.\." if @version == "1.0.5" + inreplace 'configure', 'cmake ..', "cmake -DCMAKE_INSTALL_PREFIX='#{prefix}' .." if @version == "1.0.5" system "./configure --prefix '#{prefix}'" system "make install" diff --git a/Library/Homebrew/brewkit.rb b/Library/Homebrew/brewkit.rb index 78b190d7b..9cfc999af 100644 --- a/Library/Homebrew/brewkit.rb +++ b/Library/Homebrew/brewkit.rb @@ -116,13 +116,10 @@ ENV.extend HomebrewEnvExtension def inreplace(path, before, after) before=Regexp.escape before.to_s - after=Regexp.escape after.to_s - before.gsub! "/", "\\\/" - after.gsub! "/", "\\\/" - before.gsub! "'", '\'' - after.gsub! "'", '\'' + after.gsub! "\\", "\\\\" + after.gsub! "/", "\\/" # TODO this sucks # either use 'ed', or allow regexp and use a proper ruby function - `perl -pi -e $'s/#{before}/#{after}/g' "#{path}"` + Kernel.system "perl", "-pi", "-e", "s/#{before}/#{after}/g", path end |