summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-25 02:50:24 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-25 02:50:24 +0000
commit41155e65c650e0cc77dcd8c165ec075a929bb766 (patch)
treecf5ced4f59c367a7ba2d0a2f40a3ddca449244c3
parenta0fcd60b7dba218fdb79fb8cf07160ae05e84995 (diff)
downloadruby-41155e65c650e0cc77dcd8c165ec075a929bb766.tar.gz
ruby-41155e65c650e0cc77dcd8c165ec075a929bb766.tar.xz
ruby-41155e65c650e0cc77dcd8c165ec075a929bb766.zip
* 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/trunk@21766 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/mkmf.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 42d49af14..2b0d051ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 = ""