diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-08 01:30:31 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-08 01:30:31 +0000 |
| commit | 7dc26509c69a1801a11c0ad07607faf858aee4fc (patch) | |
| tree | aeb501053a8bc0ba11b6d2072021554473281cc4 | |
| parent | 2d9e9c3fd743e07833e2954474e9da1b4e5c33d2 (diff) | |
| download | ruby-7dc26509c69a1801a11c0ad07607faf858aee4fc.tar.gz | |
* common.mk (prelude.c): depends on enc/prelude.rb.
* enc/prelude.rb: fixed initial library names.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15922 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | common.mk | 8 | ||||
| -rw-r--r-- | enc/prelude.rb | 2 |
3 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Tue Apr 8 10:30:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * common.mk (prelude.c): depends on enc/prelude.rb. + + * enc/prelude.rb: fixed initial library names. + Tue Apr 8 03:39:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * load.c (rb_provided): check expanded path for relative path @@ -85,6 +85,9 @@ OBJS = dln.$(OBJEXT) \ GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT) +PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(srcdir)/gem_prelude.rb +PRELUDES = prelude.c miniprelude.c golf_prelude.c + SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \ --extout="$(EXTOUT)" \ --mflags="$(MFLAGS)" \ @@ -734,9 +737,9 @@ transdb.h: $(PREP) miniprelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@ -prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/gem_prelude.rb $(RBCONFIG) $(PREP) +prelude.c: $(srcdir)/tool/compile_prelude.rb $(PRELUDE_SCRIPTS) $(RBCONFIG) $(PREP) $(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prelude.rb \ - $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(srcdir)/gem_prelude.rb $@.new + $(PRELUDE_SCRIPTS) $@.new $(IFCHANGE) "$@" "$@.new" golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(PREP) @@ -747,7 +750,6 @@ prereq: incs srcs preludes preludes: {$(VPATH)}miniprelude.c preludes: {$(srcdir)}golf_prelude.c -PRELUDES = prelude.c miniprelude.c golf_prelude.c docs: $(BASERUBY) -I$(srcdir) $(srcdir)/tool/makedocs.rb $(INSNS2VMOPT) diff --git a/enc/prelude.rb b/enc/prelude.rb index c0268bd622..a5c78b7e64 100644 --- a/enc/prelude.rb +++ b/enc/prelude.rb @@ -1,4 +1,4 @@ -%w'enc/init enc/trans/init'.each do |init| +%w'enc/encdb enc/trans/transdb'.each do |init| begin require(init) rescue LoadError |