summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-08-05 03:43:34 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-08-05 03:43:34 +0000
commit66902651f8d37ec9e762f96ba031869fdbb59000 (patch)
tree0261f215512301e91448ff036afdaaa71d113a60
parentd2e61ecccc133d3277b24c9bbadecaad81c23b6d (diff)
downloadruby-66902651f8d37ec9e762f96ba031869fdbb59000.tar.gz
ruby-66902651f8d37ec9e762f96ba031869fdbb59000.tar.xz
ruby-66902651f8d37ec9e762f96ba031869fdbb59000.zip
* lib/mkmf.rb (create_makefile): need to convert path separetor
before invoking install command. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8921 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/mkmf.rb12
2 files changed, 16 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e01fdecb7..01ac47f68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug 5 12:36:40 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/mkmf.rb (create_makefile): need to convert path separetor
+ before invoking install command.
+
Fri Aug 5 08:08:05 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (return_jump): fix "can't across thread" error message
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 157f20ce8..097be403e 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1025,7 +1025,17 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
dest = "#{dir}/#{f}"
mfile.print "install-so: #{dest}\n"
unless $extout
- mfile.print "#{dest}: #{f}\n\t$(INSTALL_PROG) #{f} #{dir}\n"
+ mfile.print "#{dest}: #{f}\n"
+ if (sep = config_string('BUILD_FILE_SEPARATOR'))
+ f.gsub!("/", sep)
+ dir.gsub!("/", sep)
+ sep = ":/="+sep
+ f.gsub!(/(\$\(\w+)(\))/) {$1+sep+$2}
+ f.gsub!(/(\$\{\w+)(\})/) {$1+sep+$2}
+ dir.gsub!(/(\$\(\w+)(\))/) {$1+sep+$2}
+ dir.gsub!(/(\$\{\w+)(\})/) {$1+sep+$2}
+ end
+ mfile.print "\t$(INSTALL_PROG) #{f} #{dir}\n"
end
end
dirs << (dir = "$(RUBYLIBDIR)")