diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-15 03:11:42 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-15 03:11:42 +0000 |
| commit | c955acc19cbc8b58f6aa0236cb677831199a3767 (patch) | |
| tree | f46775fdfdc848258b9da2ac0bb3b7e9802afe06 | |
| parent | b1322b8ada0396e2fc4055d969887c9f487d922d (diff) | |
| download | ruby-c955acc19cbc8b58f6aa0236cb677831199a3767.tar.gz ruby-c955acc19cbc8b58f6aa0236cb677831199a3767.tar.xz ruby-c955acc19cbc8b58f6aa0236cb677831199a3767.zip | |
* win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc,
miniprelude.c, newline.c): copy only when $(srcdir) != pwd.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21516 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win32/Makefile.sub | 12 |
2 files changed, 11 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Thu Jan 15 12:10:39 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc, + miniprelude.c, newline.c): copy only when $(srcdir) != pwd. + Thu Jan 15 11:40:44 2009 NAKAMURA Usaku <usa@ruby-lang.org> * io.c (pipe_open): revert a part of previous commit. it may be a diff --git a/win32/Makefile.sub b/win32/Makefile.sub index a3eef90bb..574681bcd 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -768,7 +768,7 @@ ext/extinit.obj: ext/extinit.c $(SETUP) $(INSNS): @if exist $(srcdir:/=\)\$(@F) ( \ - copy $(srcdir:/=\)\$(@F) $@ \ + if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ ) else ( \ @$(RM) $(PROGRAM) \ $(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@ \ @@ -776,28 +776,28 @@ $(INSNS): node_name.inc: @if exist $(srcdir:/=\)\$(@F) ( \ - copy $(srcdir:/=\)\$(@F) $@ \ + if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ ) else ( \ $(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@ \ ) known_errors.inc: @if exist $(srcdir:/=\)\$(@F) ( \ - copy $(srcdir:/=\)\$(@F) $@ \ + if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ ) else ( \ $(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def \ ) miniprelude.c: @if exist $(srcdir:/=\)\$(@F) ( \ - copy $(srcdir:/=\)\$(@F) $@ \ + if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ ) else ( \ $(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@ \ ) -newline.c: +newline.c: @if exist $(srcdir:/=\)\$(@F) ( \ - copy $(srcdir:/=\)\$(@F) $@ \ + if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ ) else ( \ $(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo newline.c $(srcdir)/enc/trans/newline.trans \ ) |