diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | cygwin/GNUmakefile.in | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
4 files changed, 6 insertions, 8 deletions
@@ -1,11 +1,9 @@ -Fri Oct 8 00:24:54 2010 James Edward Gray II <jeg2@ruby-lang.org> +Fri Oct 8 10:52:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> - * lib/csv.rb: Fixing documentation typos. [ruby-core:32712] -Thu Oct 7 18:10:35 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> +Fri Oct 8 00:24:54 2010 James Edward Gray II <jeg2@ruby-lang.org> - * 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 <naruse@ruby-lang.org> @@ -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 $(<D) --include-dir $(srcdir)/win32 $< $@ -$(RCFILES): $(RBCONFIG) config.rb +$(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb @$(MINIRUBY) $(srcdir)/win32/resource.rb \ -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \ -so_name=$(DLL_BASE_NAME) \ diff --git a/win32/Makefile.sub b/win32/Makefile.sub index ebd51e9aca..b22a1334a7 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -874,7 +874,7 @@ clean-enc distclean-enc realclean-enc: @-$(MAKE) -f $(ENC_MK) $(MFLAGS) $(@F) !endif -$(RCFILES): $(RBCONFIG) config.rb $(srcdir)/revision.h $(srcdir)/win32/resource.rb +$(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb @$(MINIRUBY) $(srcdir)/win32/resource.rb \ -ruby_name=$(RUBY_INSTALL_NAME) \ -rubyw_name=$(RUBYW_INSTALL_NAME) \ |