diff --git a/ChangeLog b/ChangeLog index 468e0d9218..0ab2b76ef0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,10 @@ +Fri Oct 8 10:52:25 2010 Nobuyoshi Nakada + + Fri Oct 8 00:24:54 2010 James Edward Gray II * lib/csv.rb: Fixing documentation typos. [ruby-core:32712] -Thu Oct 7 18:10:35 2010 Nobuyoshi Nakada - - * cygwin/GNUmakefile.in, win32/Makefile.sub (RCFILES): depend on - real config.rb file. [ruby-core:32709] - Thu Oct 7 09:14:28 2010 NARUSE, Yui * vm_exec.c (vm_exec_core): Treat clang as non gcc on this diff --git a/common.mk b/common.mk index 4cc746d2de..6c8211dcb3 100644 --- a/common.mk +++ b/common.mk @@ -448,7 +448,7 @@ extconf: $(PREP) $(MAKEDIRS) "$(EXTCONFDIR)" $(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS) -$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(PREP) +$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h $(PREP) @$(MINIRUBY) $(srcdir)/tool/mkconfig.rb -timestamp=$@ \ -install_name=$(RUBY_INSTALL_NAME) \ -so_name=$(RUBY_SO_NAME) rbconfig.rb diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index 5e2b467641..ea530a33fc 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -40,7 +40,7 @@ $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@ %.res.@OBJEXT@: %.rc @WINDRES@ --include-dir . --include-dir $(