From 275a9dcb8caa389ec7cbdfcfb860f56f5ddbc4d0 Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 4 Jan 2013 11:19:19 +0000 Subject: * Makefile.in (RBCONFIG): Moved from common.mk in order to use the variable in Makefile.in. * win32/Makefie.sub (RBCONFIG): Ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38694 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ Makefile.in | 1 + common.mk | 1 - win32/Makefile.sub | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b4ebd8d6e2..b78da6f991 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Jan 4 20:17:06 2013 Yuki Yugui Sonoda + + * Makefile.in (RBCONFIG): Moved from common.mk in order to use the + variable in Makefile.in. + + * win32/Makefie.sub (RBCONFIG): Ditto. + Fri Jan 4 19:45:50 2013 Yuki Yugui Sonoda * common.mk (run, parse): Use BTESTRUBY instead of MINIRUBY to handle diff --git a/Makefile.in b/Makefile.in index f652db2027..f5ffea88bc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -169,6 +169,7 @@ MKMAIN_CMD = mkmain.sh NEWLINE_C = newline.c MINIPRELUDE_C = miniprelude.c +RBCONFIG = .rbconfig.time SRC_FILE = $< OS_SRC_FILE = $< diff --git a/common.mk b/common.mk index 00fdbb41df..8d4316e3ef 100644 --- a/common.mk +++ b/common.mk @@ -21,7 +21,6 @@ RUBYSPEC_GIT_URL = $(SPEC_GIT_BASE)/rubyspec.git STATIC_RUBY = static-ruby EXTCONF = extconf.rb -RBCONFIG = ./.rbconfig.time LIBRUBY_EXTS = ./.libruby-with-ext.time REVISION_H = ./.revision.time PLATFORM_D = ./$(PLATFORM_DIR)/.time diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 4d291e27fe..c71cbbf986 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -390,6 +390,7 @@ MINIPRELUDE_C = $(srcdir)/miniprelude.c !else MINIPRELUDE_C = miniprelude.c !endif +RBCONFIG = .rbconfig.time !include $(srcdir)/common.mk -- cgit v1.2.3