From a1d7e6910606b237248fa95f011873ff86fa8c28 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 8 Oct 2010 01:52:37 +0000 Subject: git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 +++----- common.mk | 2 +- cygwin/GNUmakefile.in | 2 +- win32/Makefile.sub | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 468e0d9218..0ab2b76ef0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,9 @@ -Fri Oct 8 00:24:54 2010 James Edward Gray II +Fri Oct 8 10:52:25 2010 Nobuyoshi Nakada - * lib/csv.rb: Fixing documentation typos. [ruby-core:32712] -Thu Oct 7 18:10:35 2010 Nobuyoshi Nakada +Fri Oct 8 00:24:54 2010 James Edward Gray II - * cygwin/GNUmakefile.in, win32/Makefile.sub (RCFILES): depend on - real config.rb file. [ruby-core:32709] + * lib/csv.rb: Fixing documentation typos. [ruby-core:32712] Thu Oct 7 09:14:28 2010 NARUSE, Yui 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 $(