diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-08 06:09:23 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-08 06:09:23 +0000 |
| commit | b79c50b8ba378fc5948f4e50017e31b0ec863c57 (patch) | |
| tree | de3b49de72b5eb61b7396f48102974edcbb2c5bb | |
| parent | 289ce68af0db09b8938972e91de13a384c3538a1 (diff) | |
| download | ruby-b79c50b8ba378fc5948f4e50017e31b0ec863c57.tar.gz ruby-b79c50b8ba378fc5948f4e50017e31b0ec863c57.tar.xz ruby-b79c50b8ba378fc5948f4e50017e31b0ec863c57.zip | |
* lib/mkmf.rb (xsystem): expand macros like as make.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15402 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/mkmf.rb | 6 |
2 files changed, 10 insertions, 0 deletions
@@ -1,3 +1,7 @@ +Fri Feb 8 15:09:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (xsystem): expand macros like as make. + Fri Feb 8 09:27:57 2008 NARUSE, Yui <naruse@ruby-lang.org> * lib/rdoc/ri/driver.rb (read_yaml): remove SM* for compatibility. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 96696b1f3..45bf90872 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -267,6 +267,12 @@ module Logging end def xsystem command + varpat = /\$\((\w+)\)|\$\{(\w+)\}/ + if varpat =~ command + vars = Hash.new {|h, k| h[k] = ''; ENV[k]} + command = command.dup + nil while command.gsub!(varpat) {vars[$1||$2]} + end Logging::open do puts command.quote system(command) |