summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-16 06:42:38 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-16 06:42:38 +0000
commit620a2b6c65ef497529bca89abae5ea7d16e0d191 (patch)
tree5c78e43e2182b1cadc0aa708cf324c070bbb9af4
parent6fd1ef7719b7296dfd3b672c6b44c2fc74b02322 (diff)
Makefile.in: probes.h
* Makefile.in, win32/Makefile.sub (probes.h): fix copying dmyprobes.h path when outplace-build. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37674 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in2
-rw-r--r--win32/Makefile.sub3
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3246f7644f..32756eb957 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 16 15:42:36 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * Makefile.in, win32/Makefile.sub (probes.h): fix copying dmyprobes.h
+ path when outplace-build.
+
Fri Nov 16 15:27:36 2012 Masaki Matsushita <glass.saga@gmail.com>
* lib/net/pop.rb (POP3.certs): fix typo in comment.
diff --git a/Makefile.in b/Makefile.in
index 7aa6d59f0a..e3a1ff5d03 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -328,7 +328,7 @@ probes.h: dmyprobes.h
sed -e 's/RUBY_/RUBY_DTRACE_/g' $@.tmp | sed -e 's/PROBES_H_TMP/PROBES_H/g' >$@; \
$(RM) $@.tmp; \
else \
- $(CP) dmyprobes.h probes.h; \
+ $(CP) $(srcdir)/dmyprobes.h probes.h; \
fi
clean-local::
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index a073192497..62fa2dffaa 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -1049,7 +1049,8 @@ lex.c: {$(srcdir)}lex.c.blt
copy $(?:/=\) $@
probes.h: dmyprobes.h
- copy dmyprobes.h probes.h
+ @$(ECHO) copying probes.h
+ $(Q) $(CP) $(srcdir)\dmyprobes.h probes.h
enc/unicode/name2ctype.h: {$(srcdir)}enc/unicode/name2ctype.h.blt
@if not exist $(@D:/=\) md $(@D:/=\)