1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* win32/Makefile.sub (prelude.c): search from source directory,

not depending on VPATH, in parallel to r35135.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48378 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-11-11 10:29:00 +00:00
parent 1a9a3c3944
commit 50ad0f58bb
3 changed files with 7 additions and 1 deletions

View file

@ -173,6 +173,7 @@ INSTALLED_LIST= .installed.list
NEWLINE_C = newline.c
MINIPRELUDE_C = miniprelude.c
PRELUDE_C = prelude.c
RBCONFIG = .rbconfig.time
SRC_FILE = $<

View file

@ -974,7 +974,7 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE) {$(srcdir)}prelude.rb
$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -o $@ \
$(srcdir)/template/prelude.c.tmpl prelude.rb
{$(VPATH)}prelude.c: $(COMPILE_PRELUDE) $(RBCONFIG) \
$(PRELUDE_C): $(COMPILE_PRELUDE) $(RBCONFIG) \
{$(srcdir)}lib/rubygems/defaults.rb \
{$(srcdir)}lib/rubygems/core_ext/kernel_gem.rb \
$(PRELUDE_SCRIPTS) $(PREP) $(LIB_SRCS)

View file

@ -403,6 +403,11 @@ MINIPRELUDE_C = $(srcdir)/miniprelude.c
!else
MINIPRELUDE_C = miniprelude.c
!endif
!if !exist(prelude.c) && exist($(srcdir)/prelude.c)
PRELUDE_C = $(srcdir)/prelude.c
!else
PRELUDE_C = prelude.c
!endif
RBCONFIG = ./.rbconfig.time
!include $(srcdir)/common.mk