diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-11 10:29:00 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-11 10:29:00 +0000 |
commit | 50ad0f58bbac0eaee8293ebe886b4fd3128fc89b (patch) | |
tree | 4518f38912b69dcb9bf667ac4c7d484880ce6acf | |
parent | 1a9a3c394426eaeea17cc7b8dabbaded30c19aab (diff) | |
download | ruby-50ad0f58bbac0eaee8293ebe886b4fd3128fc89b.tar.gz |
* 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
-rw-r--r-- | Makefile.in | 1 | ||||
-rw-r--r-- | common.mk | 2 | ||||
-rw-r--r-- | win32/Makefile.sub | 5 |
3 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 0b96347e3d..19a7a91fb1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 = $< @@ -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) diff --git a/win32/Makefile.sub b/win32/Makefile.sub index c7cd2db699..5aad997f00 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -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 |