1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/extmk.rb, lib/mkmf.rb: use BUILD_FILE_SEPARATOR in Makefiles.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10163 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2006-05-17 15:42:21 +00:00
parent 8c5f9ef2ea
commit fbbc511d65
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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> 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(). * re.c (rb_reg_prepare_re): don't use onig_recompile().

4
ext/extmk.rb
View File

@ -306,8 +306,8 @@ end
EXEEXT = CONFIG['EXEEXT'] EXEEXT = CONFIG['EXEEXT']
if CROSS_COMPILING if CROSS_COMPILING
$ruby = CONFIG['MINIRUBY'] $ruby = CONFIG['MINIRUBY']
elsif $nmake elsif sep = config_string('BUILD_FILE_SEPARATOR')
$ruby = '$(topdir:/=\\)\\miniruby' + EXEEXT $ruby = "$(topdir:/=#{sep})#{sep}miniruby" + EXEEXT
else else
$ruby = '$(topdir)/miniruby' + EXEEXT $ruby = '$(topdir)/miniruby' + EXEEXT
end end

2
lib/mkmf.rb
View File

@ -1383,7 +1383,7 @@ LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L"%s"'
RPATHFLAG = config_string('RPATHFLAG') || '' RPATHFLAG = config_string('RPATHFLAG') || ''
LIBARG = config_string('LIBARG') || '-l%s' LIBARG = config_string('LIBARG') || '-l%s'
sep = File::ALT_SEPARATOR ? ":/=#{File::ALT_SEPARATOR}" : '' sep = config_string('BUILD_FILE_SEPARATOR') {|sep| ":/=#{sep}" if sep != "/"} || ""
CLEANINGS = " CLEANINGS = "
clean: clean:
@-$(RM) $(CLEANLIBS#{sep}) $(CLEANOBJS#{sep}) $(CLEANFILES#{sep}) @-$(RM) $(CLEANLIBS#{sep}) $(CLEANOBJS#{sep}) $(CLEANFILES#{sep})