diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-25 13:54:37 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-25 13:54:37 +0000 |
| commit | 5f305864e5f5067f6f3a123b986ef1473ea45ebb (patch) | |
| tree | 75c9b007e59119c0a7a33d9581d86d8275f74429 | |
| parent | 00f53c1e1774bc10e2483ee3a73e856543a073a5 (diff) | |
* win32/Makefile.sub (config.status): use un.rb as cp instead of
cmd.exe's copy command.
* lib/mkmf.rb (create_makefile): no longer need to convert path
separator when copying file.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@22629 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/mkmf.rb | 11 |
2 files changed, 9 insertions, 10 deletions
@@ -1,3 +1,11 @@ +Wed Feb 25 22:54:13 2009 NAKAMURA Usaku <[email protected]> + + * win32/Makefile.sub (config.status): use un.rb as cp instead of + cmd.exe's copy command. + + * lib/mkmf.rb (create_makefile): no longer need to convert path + separator when copying file. + Wed Feb 25 22:53:04 2009 NAKAMURA Usaku <[email protected]> * eval.c (rb_thread_schedule): mswin32 doesn't have F_GETFD, so check diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 255b84c438..6a70565dde 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1569,16 +1569,7 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} dest = "#{dir}/#{File.basename(f)}" mfile.print("install-rb#{sfx}: #{dest}\n") mfile.print("#{dest}: #{f} #{dir}\n\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) ") - sep = config_string('BUILD_FILE_SEPARATOR') - if sep - f = f.gsub("/", sep) - sep = ":/="+sep - f = f.gsub(/(\$\(\w+)(\))/) {$1+sep+$2} - f = f.gsub(/(\$\{\w+)(\})/) {$1+sep+$2} - else - sep = "" - end - mfile.print("#{f} $(@D#{sep})\n") + mfile.print("#{f} $(@D)\n") if defined?($installed_list) and !$extout mfile.print("\t@echo #{dest}>>$(INSTALLED_LIST)\n") end |