diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 8 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Thu Sep 10 23:00:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (create_makefile): fix for parallel execution. + [ruby-core:25509] + Sat Sep 5 06:29:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * io.c (rb_io_binmode): check if closed regardless platforms. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 702e1f2e50..f0fde56c31 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1,3 +1,4 @@ +# -*- indent-tabs-mode: t -*- # module to create Makefile for extension modules # invoke like: ruby -r mkmf extconf.rb @@ -1549,7 +1550,8 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} dir.gsub!(/(\$\(\w+)(\))/) {$1+sep+$2} dir.gsub!(/(\$\{\w+)(\})/) {$1+sep+$2} end - mfile.print "\t$(INSTALL_PROG) #{f} #{dir}\n" + mfile.print "\t@-$(MAKEDIRS) $(@D#{sep})\n" + mfile.print "\t$(INSTALL_PROG) #{f} $(@D#{sep})\n" if defined?($installed_list) mfile.print "\t@echo #{dir}/#{File.basename(f)}>>$(INSTALLED_LIST)\n" end @@ -1571,8 +1573,8 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} files.each do |f| dest = "#{dir}/#{File.basename(f)}" mfile.print("install-rb#{sfx}: #{dest}\n") - mfile.print("#{dest}: #{f} #{dir}\n\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) ") - mfile.print("#{f} $(@D)\n") + mfile.print("#{dest}: #{f}\n\t@-$(MAKEDIRS) $(@D#{sep})\n") + mfile.print("\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} $(@D#{sep})\n") if defined?($installed_list) and !$extout mfile.print("\t@echo #{dest}>>$(INSTALLED_LIST)\n") end @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.8" -#define RUBY_RELEASE_DATE "2009-09-05" +#define RUBY_RELEASE_DATE "2009-09-10" #define RUBY_VERSION_CODE 188 -#define RUBY_RELEASE_CODE 20090905 +#define RUBY_RELEASE_CODE 20090910 #define RUBY_PATCHLEVEL -1 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 8 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 9 -#define RUBY_RELEASE_DAY 5 +#define RUBY_RELEASE_DAY 10 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |