From 8eedcaa6b52f1318aab00f9c3000fdae80d22c52 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 4 Jul 2014 17:32:51 +0000 Subject: [PATCH] common.mk: move DEFAULT_PRELUDES * common.mk (DEFAULT_PRELUDES): no longer configurable since r43278, move from Makefile.in and win32/Makefile.sub. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46699 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- Makefile.in | 2 -- common.mk | 1 + win32/Makefile.sub | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 04fb4834a9..df336c906b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -113,8 +113,6 @@ XRUBY_LIBDIR = @XRUBY_LIBDIR@ XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@ XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@ -DEFAULT_PRELUDES = $(GEM_PRELUDE) - #### End of system configuration section. #### MAJOR= @MAJOR@ diff --git a/common.mk b/common.mk index 72c9905fa8..6dc1129e3c 100644 --- a/common.mk +++ b/common.mk @@ -109,6 +109,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT) +DEFAULT_PRELUDES = $(GEM_PRELUDE) PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(DEFAULT_PRELUDES) GEM_PRELUDE = $(srcdir)/gem_prelude.rb PRELUDES = prelude.c miniprelude.c diff --git a/win32/Makefile.sub b/win32/Makefile.sub index e4e14e56e9..9cc12e3778 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -295,7 +295,6 @@ BTESTRUBY = $(MINIRUBY) !ifndef RUBY RUBY = ruby !endif -DEFAULT_PRELUDES = $(GEM_PRELUDE) DTRACE_EXT = dmyh