[前][次][番号順一覧][スレッド一覧]

ruby-changes:38366

From: nobu <ko1@a...>
Date: Fri, 8 May 2015 17:22:21 +0900 (JST)
Subject: [ruby-changes:38366] nobu:r50447 (trunk): extconf.rb: no nmake style VPATH

nobu	2015-05-08 17:22:06 +0900 (Fri, 08 May 2015)

  New Revision: 50447

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50447

  Log:
    extconf.rb: no nmake style VPATH
    
    * ext/io/console/extconf.rb: only nmake needs remove  style VPATH.

  Modified files:
    trunk/ext/io/console/depend
    trunk/ext/io/console/extconf.rb
Index: ext/io/console/depend
===================================================================
--- ext/io/console/depend	(revision 50446)
+++ ext/io/console/depend	(revision 50447)
@@ -1,5 +1,3 @@ https://github.com/ruby/ruby/blob/trunk/ext/io/console/depend#L1
-WIN32_VK_HEADER = {$(srcdir)}win32_vk.chksum
-
 $(OBJS): $(HDRS) $(ruby_headers) \
   $(VK_HEADER) \
   $(hdrdir)/ruby/io.h \
Index: ext/io/console/extconf.rb
===================================================================
--- ext/io/console/extconf.rb	(revision 50446)
+++ ext/io/console/extconf.rb	(revision 50447)
@@ -5,7 +5,7 @@ hdr = nil https://github.com/ruby/ruby/blob/trunk/ext/io/console/extconf.rb#L5
 case
 when macro_defined?("_WIN32", "")
   # rb_w32_map_errno: 1.8.7
-  vk_header = "$(WIN32_VK_HEADER)"
+  vk_header = ($nmake == ?n ? "{$(srcdir)}" : "") << "win32_vk.chksum"
 when hdr = %w"termios.h termio.h".find {|h| have_header(h)}
   have_func("cfmakeraw", hdr)
 when have_header(hdr = "sgtty.h")

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]