From b77d1a4f3404261b5fbf588c1311adc51c859d96 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 13 Apr 2013 12:14:37 +0000
Subject: * 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog         | 7 +++++++
 ext/ripper/depend | 4 ++--
 lib/mkmf.rb       | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 563c837453..647dead44e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Apr 13 21:09:02 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* Merge Onigmo 5.13.4 f22cf2e566712cace60d17f84d63119d7c5764ee.
diff --git a/ext/ripper/depend b/ext/ripper/depend
index 1eb9f7d1df..198143ad85 100644
--- a/ext/ripper/depend
+++ b/ext/ripper/depend
@@ -15,8 +15,8 @@ ripper.o: ripper.c id.c lex.c eventids1.c eventids2.c eventids2table.c \
 	$(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
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 73d1ea8046..0352685f89 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1822,6 +1822,7 @@ PATH_SEPARATOR = #{CONFIG['PATH_SEPARATOR']}
 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"])
-- 
cgit v1.2.3