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

ruby-changes:28226

From: usa <ko1@a...>
Date: Sat, 13 Apr 2013 21:16:11 +0900 (JST)
Subject: [ruby-changes:28226] usa:r40278 (trunk): * lib/mkmf.rb (MakeMakefile#create_makefile): output new macro

usa	2013-04-13 21:14:37 +0900 (Sat, 13 Apr 2013)

  New Revision: 40278

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

  Log:
    * lib/mkmf.rb (MakeMakefile#create_makefile): output new macro
      disthdrdir to specify the path of id.h, parse.h and etc.
    
    * ext/ripper/depend: use above macro.

  Modified files:
    trunk/ChangeLog
    trunk/ext/ripper/depend
    trunk/lib/mkmf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40277)
+++ ChangeLog	(revision 40278)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Apr 13 21:09:02 2013  NAKAMURA Usaku  <usa@r...>
+
+	* lib/mkmf.rb (MakeMakefile#create_makefile): output new macro
+	  disthdrdir to specify the path of id.h, parse.h and etc.
+
+	* ext/ripper/depend: use above macro.
+
 Sat Apr 13 20:28:08 2013  NARUSE, Yui  <naruse@r...>
 
 	* Merge Onigmo 5.13.4 f22cf2e566712cace60d17f84d63119d7c5764ee.
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 40277)
+++ lib/mkmf.rb	(revision 40278)
@@ -1822,6 +1822,7 @@ PATH_SEPARATOR = #{CONFIG['PATH_SEPARATO https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L1822
 VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
 }
     if $extmk
+      mk << "disthdrdir = #{$nmake ? '{$(VPATH)}' : '$(top_srcdir)/'}\n"
       mk << "RUBYLIB =\n""RUBYOPT = -\n"
     end
     prefix = mkintpath(CONFIG["prefix"])
Index: ext/ripper/depend
===================================================================
--- ext/ripper/depend	(revision 40277)
+++ ext/ripper/depend	(revision 40278)
@@ -15,8 +15,8 @@ ripper.o: ripper.c id.c lex.c eventids1. https://github.com/ruby/ruby/blob/trunk/ext/ripper/depend#L15
 	$(hdrdir)/ruby/util.h \
 	$(top_srcdir)/node.h \
 	$(top_srcdir)/internal.h \
-	parse.h \
-	id.h \
+	$(disthdrdir)parse.h \
+	$(disthdrdir)id.h \
 	$(top_srcdir)/regenc.h \
 	$(top_srcdir)/vm_opts.h \
 	$(topdir)/probes.h

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

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