diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-28 09:23:12 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-28 09:23:12 +0000 |
| commit | a4fea1443a42c19e4d38a2322a85b38fba4f3fb4 (patch) | |
| tree | a2432ad486f80da25086c65762a8d54b573d3e7c | |
| parent | 1324b5a5213d75cba319ad20019dc7ccf3f64d89 (diff) | |
| download | ruby-a4fea1443a42c19e4d38a2322a85b38fba4f3fb4.tar.gz ruby-a4fea1443a42c19e4d38a2322a85b38fba4f3fb4.tar.xz ruby-a4fea1443a42c19e4d38a2322a85b38fba4f3fb4.zip | |
merges r21766 from trunk into ruby_1_9_1.
* lib/mkmf.rb (create_makefile):fixed the variables order because
converter proc refers the separator.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21834 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sun Jan 25 11:50:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (create_makefile):fixed the variables order because + converter proc refers the separator. + Sun Jan 25 11:25:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * Makefile.in, win32/Makefile.sub (RMDIRS): remove directory and diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 1d46f6c29..ec264796a 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1657,12 +1657,12 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} mfile.print CLEANINGS fsep = config_string('BUILD_FILE_SEPARATOR') {|s| s unless s == "/"} if fsep + sep = ":/=#{fsep}" fseprepl = proc {|s| s = s.gsub("/", fsep) s = s.gsub(/(\$\(\w+)(\))/) {$1+sep+$2} s = s.gsub(/(\$\{\w+)(\})/) {$1+sep+$2} } - sep = ":/=#{fsep}" else fseprepl = proc {|s| s} sep = "" |