diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ext/extmk.rb | 4 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 |
3 files changed, 10 insertions, 6 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. + Mon May 15 21:37:12 2006 K.Kosako <sndgk393 AT ybb.ne.jp> * re.c (rb_reg_prepare_re): don't use onig_recompile(). @@ -52,7 +56,7 @@ Mon May 1 17:58:16 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp> Mon May 1 08:32:10 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp> - * ext/win32ole/win32ole.c (ole_param_ole_type): should return + * ext/win32ole/win32ole.c (ole_param_ole_type): should return "unknown type" string when ITypeInfo::GetFuncDesc failed. Sat Apr 29 22:43:37 2006 GOTOU Yuuzou <gotoyuzo@notwork.org> @@ -82,7 +86,7 @@ Tue Apr 18 17:40:37 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Sat Apr 8 18:06:28 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp> - * ext/win32ole/win32ole.c: add WIN32OLE_METHOD#inspect, + * ext/win32ole/win32ole.c: add WIN32OLE_METHOD#inspect, WIN32OLE_PARAM#inspect. * test/win32ole/test_win32ole_method.rb: ditto. @@ -131,7 +135,7 @@ Wed Apr 5 00:22:54 2006 Tanaka Akira <akr@m17n.org> Sat Apr 1 15:11:27 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp> - * ext/win32ole/win32ole.c :add WIN32OLE_TYPE#inspect, + * ext/win32ole/win32ole.c :add WIN32OLE_TYPE#inspect, WIN32OLE_VARIABLE#inspect * remove ext/win32ole/tests/testOLEVARIABLE.rb, testOLETYPE.rb diff --git a/ext/extmk.rb b/ext/extmk.rb index 93f9a2fccd..d0baa837e9 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -306,8 +306,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 ab3d77e807..f9a4d237b3 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1383,7 +1383,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}) |