diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | common.mk | 6 | ||||
| -rw-r--r-- | win32/Makefile.sub | 9 |
3 files changed, 15 insertions, 5 deletions
@@ -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. @@ -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 |