diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-05-27 07:49:06 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-05-27 07:49:06 +0000 |
| commit | 4eae21a92dfdfa010b8f91c7a7b11cf3e9215e2f (patch) | |
| tree | c6e25d91cca586159cb580e8d89cc0091a914114 | |
| parent | 476f4239d90c43add10130023146061bc7c80b72 (diff) | |
* lib/mkmf.rb: use the semicolon as the path separator
in the environment of MSYS. fixed: [ruby-dev:26232]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8530 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 14 |
2 files changed, 14 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Fri May 27 16:32:04 2005 WATANABE Hirofumi <eban@ruby-lang.org> + + * lib/mkmf.rb: use the semicolon as the path separator + in the environment of MSYS. fixed: [ruby-dev:26232] + Thu May 26 06:08:11 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * ext/tk/lib/tk.rb: add shortcut-methods of tk_call + tk_split_list diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 184b9b3269..3c61eccbda 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -834,11 +834,15 @@ end def configuration(srcdir) mk = [] vpath = %w[$(srcdir) $(topdir) $(hdrdir)] - if !CROSS_COMPILING && CONFIG['build_os'] == 'cygwin' && CONFIG['target_os'] != 'cygwin' - vpath.each {|p| p.sub!(/.*/, '$(shell cygpath -u \&)')} - end - if !CROSS_COMPILING && CONFIG['build_os'] == 'msdosdjgpp' - CONFIG['PATH_SEPARATOR'] = ';' + if !CROSS_COMPILING + case CONFIG['build_os'] + when 'cygwin' + if CONFIG['target_os'] != 'cygwin' + vpath.each {|p| p.sub!(/.*/, '$(shell cygpath -u \&)')} + end + when 'msdosdjgpp', 'mingw32' + CONFIG['PATH_SEPARATOR'] = ';' + end end mk << %{ SHELL = /bin/sh |