diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | ext/extmk.rb | 4 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 |
3 files changed, 11 insertions, 7 deletions
@@ -1,3 +1,7 @@ +Thu May 18 00:42:12 2006 nobuyoshi nakada <nobu@ruby-lang.org> + + * ext/extmk.rb, lib/mkmf.rb: use BUILD_FILE_SEPARATOR in Makefiles. + Wed May 17 17:55:26 2006 Yukihiro Matsumoto <matz@ruby-lang.org> * dir.c (sys_warning): should not call a vararg function @@ -224,8 +228,8 @@ Thu Apr 6 01:04:47 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Wed Mar 29 20:54:44 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp> - * ext/win32ole/win32ole.c (fole_getproperty): WIN32OLE#[] should accept - multi arguments. + * ext/win32ole/win32ole.c (fole_getproperty): WIN32OLE#[] should accept + multi arguments. * ext/win32ole/tests/testWIN32OLE.rb (test_setproperty_bracket): ditto. @@ -320,7 +324,7 @@ Sat Mar 4 01:08:07 2006 Yukihiro Matsumoto <matz@ruby-lang.org> Thu Mar 2 19:44:18 2006 Tanaka Akira <akr@m17n.org> - * gc.c: align VALUE with sizeof(RVALUE) globally. + * gc.c: align VALUE with sizeof(RVALUE) globally. (is_pointer_to_heap): check alignment out of loop. (id2ref): avoid collision between symbols and objects. (rb_obj_id): ditto. moved from object.c. @@ -542,7 +546,7 @@ Mon Feb 13 13:27:00 2006 Yukihiro Matsumoto <matz@ruby-lang.org> Mon Feb 13 00:04:00 2006 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> * lib/erb.rb (ERB::Compiler): add instance variable @insert_cmd to - change <%='s behavior. (backported 1.15 - 1.16) + change <%='s behavior. (backported 1.15 - 1.16) Sat Feb 11 02:04:11 2006 Yukihiro Matsumoto <matz@ruby-lang.org> diff --git a/ext/extmk.rb b/ext/extmk.rb index ec544f2b4e..210f709442 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -305,8 +305,8 @@ end EXEEXT = CONFIG['EXEEXT'] if CROSS_COMPILING $ruby = CONFIG['MINIRUBY'] -elsif $nmake - $ruby = '$(topdir:/=\\)\\miniruby' + EXEEXT +elsif sep = config_string('BUILD_FILE_SEPARATOR') + $ruby = "$(topdir:/=#{sep})#{sep}miniruby" + EXEEXT else $ruby = '$(topdir)/miniruby' + EXEEXT end diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 28e8378fdc..a7c287ddd5 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1377,7 +1377,7 @@ LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L"%s"' RPATHFLAG = config_string('RPATHFLAG') || '' LIBARG = config_string('LIBARG') || '-l%s' -sep = File::ALT_SEPARATOR ? ":/=#{File::ALT_SEPARATOR}" : '' +sep = config_string('BUILD_FILE_SEPARATOR') {|sep| ":/=#{sep}" if sep != "/"} || "" CLEANINGS = " clean: @-$(RM) $(CLEANLIBS#{sep}) $(CLEANOBJS#{sep}) $(CLEANFILES#{sep}) |