diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-25 06:07:10 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-25 06:07:10 +0000 |
| commit | 3540727af57ee166993da274d924b278a0bd0d9a (patch) | |
| tree | 99f1a079970e27ea23bb3d624d7a73fbe6971e8d | |
| parent | dd43561fd6d7d816e6a8e8b045305fe560961040 (diff) | |
| download | ruby-3540727af57ee166993da274d924b278a0bd0d9a.tar.gz | |
* 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/trunk@22621 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 1 |
3 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Wed Feb 25 15:05:35 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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 12:27:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (rb_str_force_encoding): should clear coderange at changing diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 260e8eb03a..8af18379e1 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1712,7 +1712,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'}) ") - mfile.print("#{fseprepl[f]} $(@D#{sep})\n") + mfile.print("#{f} $(@D)\n") if defined?($installed_list) and !$extout mfile.print("\t@echo #{dest}>>$(INSTALLED_LIST)\n") end diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 6ca56bf785..cff6bca20a 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -584,7 +584,6 @@ s,@SET_MAKE@,MFLAGS = -$$(MAKEFLAGS),;t t s,@RM@,$$(COMSPEC) /C $$(top_srcdir:/=\)\win32\rm.bat,;t t s,@RMDIRS@,$$(COMSPEC) /C $$(top_srcdir:/=\)\win32\rmdirs.bat,;t t s,@RMALL@,$$(COMSPEC) /C rmdir /s /q,;t t -s,@CP@,copy > nul,;t t s,@LIBOBJS@,$(LIBOBJS),;t t s,@ALLOCA@,$(ALLOCA),;t t s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t |