summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-10-07 09:10:47 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-10-07 09:10:47 +0000
commit0dd56a828eb4cb6840a5bba83a2c59adbbe6c8d9 (patch)
tree5c0c6dc8c96a67722c6c1ae86e0465804e9ec91e
parent9b158969594f3a87701da97feb106ded14669a79 (diff)
* cygwin/GNUmakefile.in, win32/Makefile.sub (RCFILES): depend on
real config.rb file. [ruby-core:32709] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29421 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--cygwin/GNUmakefile.in2
-rw-r--r--win32/Makefile.sub3
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 850f14f..b6079e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 7 18:10:35 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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 <naruse@ruby-lang.org>
* vm_exec.c (vm_exec_core): Treat clang as non gcc on this
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index eb6967a..5e2b467 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)
+$(RCFILES): $(RBCONFIG) config.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 654e70b..ebd51e9 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -237,6 +237,7 @@ CPPFLAGS = $(DEFS) $(ARCHDEFS) $(CPPFLAGS)
DLDFLAGS = $(LDFLAGS) -dll
SOLIBS =
+RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
LIBRUBY_LDSHARED = $(LDSHARED)
LIBRUBY_DLDFLAGS = $(EXTLDFLAGS) -implib:dummy.lib -def:$(RUBYDEF)
@@ -873,7 +874,7 @@ clean-enc distclean-enc realclean-enc:
@-$(MAKE) -f $(ENC_MK) $(MFLAGS) $(@F)
!endif
-$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
+$(RCFILES): $(RBCONFIG) config.rb $(srcdir)/revision.h $(srcdir)/win32/resource.rb
@$(MINIRUBY) $(srcdir)/win32/resource.rb \
-ruby_name=$(RUBY_INSTALL_NAME) \
-rubyw_name=$(RUBYW_INSTALL_NAME) \