summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-07-03 03:20:32 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-07-03 03:20:32 +0000
commita11ab83884c47f729a8630ab5ef21c7522b48386 (patch)
tree060bc7c1c3df48e50fd50398a177bcbbab3741b7
parentf126a442e2e0bfe78e46f0bbbe48f0ba35b92cbf (diff)
* lib/mkmf.rb (VPATH): convert from Windows form to Unix form on
MinGW. This fixes the build with GNU make 3.80-1 for Cygwin. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4030 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/mkmf.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 49293d9e7e..9291152759 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 3 12:13:05 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * lib/mkmf.rb (VPATH): convert from Windows form to Unix form on
+ MinGW. This fixes the build with GNU make 3.80-1 for Cygwin.
+
Wed Jul 2 13:22:39 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_shared_replace): clear flags before copy.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 551fa4a5a5..7ae2349046 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -544,7 +544,7 @@ SHELL = /bin/sh
srcdir = #{srcdir}
topdir = #{$topdir}
hdrdir = #{$hdrdir}
-VPATH = $(srcdir)
+VPATH = #{$mingw and CONFIG['build_os'] == 'cygwin' ? '$(shell cygpath -u $(srcdir))' : '$(srcdir)'}
}
drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/
if destdir = CONFIG["prefix"].scan(drive)[0] and !destdir.empty?