ruby-changes:34616
From: nobu <ko1@a...>
Date: Sat, 5 Jul 2014 02:32:59 +0900 (JST)
Subject: [ruby-changes:34616] nobu:r46699 (trunk): common.mk: move DEFAULT_PRELUDES
nobu 2014-07-05 02:32:51 +0900 (Sat, 05 Jul 2014) New Revision: 46699 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=46699 Log: common.mk: move DEFAULT_PRELUDES * common.mk (DEFAULT_PRELUDES): no longer configurable since r43278, move from Makefile.in and win32/Makefile.sub. Modified files: trunk/Makefile.in trunk/common.mk trunk/win32/Makefile.sub Index: common.mk =================================================================== --- common.mk (revision 46698) +++ common.mk (revision 46699) @@ -109,6 +109,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIO https://github.com/ruby/ruby/blob/trunk/common.mk#L109 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 Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 46698) +++ win32/Makefile.sub (revision 46699) @@ -295,7 +295,6 @@ BTESTRUBY = $(MINIRUBY) https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L295 !ifndef RUBY RUBY = ruby !endif -DEFAULT_PRELUDES = $(GEM_PRELUDE) DTRACE_EXT = dmyh Index: Makefile.in =================================================================== --- Makefile.in (revision 46698) +++ Makefile.in (revision 46699) @@ -113,8 +113,6 @@ XRUBY_LIBDIR = @XRUBY_LIBDIR@ https://github.com/ruby/ruby/blob/trunk/Makefile.in#L113 XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@ XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@ -DEFAULT_PRELUDES = $(GEM_PRELUDE) - #### End of system configuration section. #### MAJOR= @MAJOR@ -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/