From f317a1562e1b8c871227559c64a6839070af663d Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 22 Nov 2012 12:49:59 +0000
Subject: [PATCH] * common.mk, win32/Makefile.sub (probes.dmyh): now be made in
 current   (=build) directory if build from the repository.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37806 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          | 5 +++++
 common.mk          | 6 +++---
 win32/Makefile.sub | 9 +++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f7de56c166..89066d4f5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 22 21:48:48 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk, win32/Makefile.sub (probes.dmyh): now be made in current
+	  (=build) directory if build from the repository.
+
 Thu Nov 22 21:34:51 2012  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* test/ruby/test_rubyoptions.rb: added a test.
diff --git a/common.mk b/common.mk
index ba02083a42..4e48b1526d 100644
--- a/common.mk
+++ b/common.mk
@@ -855,7 +855,7 @@ srcs-enc: $(ENC_MK)
 
 all-incs: incs
 incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h {$(VPATH)}transdb.h {$(VPATH)}known_errors.inc \
-      $(srcdir)/revision.h $(REVISION_H) enc/unicode/name2ctype.h {$(VPATH)}id.h $(srcdir)/probes.dmyh
+      $(srcdir)/revision.h $(REVISION_H) enc/unicode/name2ctype.h {$(VPATH)}id.h {$(VPATH)}probes.dmyh
 
 insns: $(INSNS)
 
@@ -896,10 +896,10 @@ golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(srcdir)/prelude.
 	$(ECHO) generating $@
 	$(Q) $(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@
 
-$(srcdir)/probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb
+probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb
 	$(BASERUBY) $(srcdir)/tool/gen_dummy_probes.rb $(srcdir)/probes.d > $@
 
-probes.h: $(srcdir)/probes.$(DTRACE_EXT)
+probes.h: {$(VPATH)}probes.$(DTRACE_EXT)
 
 prereq: incs srcs preludes PHONY
 
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 49159938d2..b64d576a40 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -1067,9 +1067,14 @@ ext/extinit.obj: ext/extinit.c $(SETUP)
 	$(ECHO) compiling ext/extinit.c
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
 
-probes.h: {$(srcdir)}probes.dmyh
+probes.h: {$(VPATH)}probes.dmyh
 	@$(ECHO) copying dummy $(DEST_FILE)
-	$(Q) $(CP) $(srcdir:/=\)\probes.dmyh $(OS_DEST_FILE)
+	@if exist probes.dmyh (\
+	  $(Q) $(CP) probes.dmyh $(OS_DEST_FILE)\
+	) else (\
+	  $(Q) $(CP) $(srcdir:/=\)\probes.dmyh $(OS_DEST_FILE)\
+	)
+
 
 INSNS	= opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
 	  vmtc.inc vm.inc