From a93b377bb0d1bcf237ed08d2fc87a63932407383 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 28 Jan 2009 09:23:12 +0000 Subject: 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21834 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/mkmf.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7fb7b6569d..25b8435cb4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jan 25 11:50:20 2009 Nobuyoshi Nakada + + * lib/mkmf.rb (create_makefile):fixed the variables order because + converter proc refers the separator. + Sun Jan 25 11:25:10 2009 Nobuyoshi Nakada * Makefile.in, win32/Makefile.sub (RMDIRS): remove directory and diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 1d46f6c299..ec264796ae 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 = "" -- cgit v1.2.3