diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-11 07:19:28 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-11 07:19:28 +0000 |
commit | 7554dd13468b105faec11f5d8ffef4499381c59d (patch) | |
tree | b0024ff2934773ace47d21e9950cbbcd58e25e23 | |
parent | 2db98d937aa31ae832896e55b3293eea2c9204f3 (diff) |
* Makefile.in, */Makefile.sub (CP, MV): added.
* common.mk (.y.c): not discard the old target until successfully
created.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14194 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | bcc32/Makefile.sub | 2 | ||||
-rw-r--r-- | common.mk | 5 | ||||
-rw-r--r-- | win32/Makefile.sub | 2 | ||||
-rw-r--r-- | wince/Makefile.sub | 2 |
6 files changed, 18 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Tue Dec 11 16:19:26 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * Makefile.in, */Makefile.sub (CP, MV): added. + + * common.mk (.y.c): not discard the old target until successfully + created. + Tue Dec 11 15:20:39 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * object.c (Init_Object): singleton_method_{added,removed,undefined} diff --git a/Makefile.in b/Makefile.in index 82e5a235bd..702fa518d6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -81,6 +81,8 @@ ARCHFILE = @ARCHFILE@ SETUP = EXTSTATIC = @EXTSTATIC@ +CP = cp +MV = mv RM = rm -f NM = @NM@ AR = @AR@ diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index c79e586402..971b62c297 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -67,6 +67,8 @@ BASERUBY = ruby PURIFY = AUTOCONF = autoconf RM = $(srcdir:/=\)\win32\rm.bat +CP = copy > nul +MV = ren > nul !if !defined(PROCESSOR_ARCHITECTURE) PROCESSOR_ARCHITECTURE = x86 @@ -355,8 +355,9 @@ PHONY: {$(srcdir)}.y.c: $(YACC) $(YFLAGS) -o y.tab.c $< - sed -f $(srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@ - @$(RM) y.tab.c + sed -f $(srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new + @$(RM) $@ y.tab.c + @$(MV) $@.new $@ acosh.$(OBJEXT): {$(VPATH)}acosh.c alloca.$(OBJEXT): {$(VPATH)}alloca.c diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 50dcc09aea..276dc4e84c 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -50,6 +50,8 @@ AR = lib -nologo PURIFY = AUTOCONF = autoconf RM = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat +CP = copy > nul +MV = ren > nul !if !defined(BASERUBY) BASERUBY = ruby !endif diff --git a/wince/Makefile.sub b/wince/Makefile.sub index 07fc4d41a5..a7de413f40 100644 --- a/wince/Makefile.sub +++ b/wince/Makefile.sub @@ -44,6 +44,8 @@ AR = lib -nologo PURIFY = AUTOCONF = autoconf RM = $(srcdir)\win32\rm.bat +CP = copy > nul +MV = ren > nul !if !defined(BASERUBY) BASERUBY = ruby !endif |