summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-04-20 11:24:43 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-04-20 11:24:43 +0000
commit00d4da468c8c9ea3057dbf3d9f825c3915457f67 (patch)
tree5a13bdc06b8eff7028b82dd166a5cebb11671634
parent160f2ce0def8a8be8d9af6a1171a68006050d11c (diff)
* common.mk ($(arch)-fake.rb): revert r50354 because bsdmake seems not
to handle such substitution. * tool/expand-config.rb: convert path separators here. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50357 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rwxr-xr-xtool/expand-config.rb1
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0121237..5036863 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Apr 20 20:23:04 2015 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * common.mk ($(arch)-fake.rb): revert r50354 because bsdmake seems not
+ to handle such substitution.
+
+ * tool/expand-config.rb: convert path separators here.
+
Mon Apr 20 16:52:20 2015 NAKAMURA Usaku <usa@ruby-lang.org>
* too/fake.rb: don't fake libdir. use libdirname instead.
diff --git a/tool/expand-config.rb b/tool/expand-config.rb
index c132d4a..0b6fa54 100755
--- a/tool/expand-config.rb
+++ b/tool/expand-config.rb
@@ -9,6 +9,7 @@ config["RUBY_RELEASE_DATE"] ||=
while /\A(\w+)=(.*)/ =~ ARGV[0]
config[$1] = $2
+ config[$1].tr(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
ARGV.shift
end