summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-17 12:41:27 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-17 12:41:27 +0000
commitbd79a2eb2d62c9c79a27fa87470aecee17bca6ec (patch)
treefa49c6901ccc57aa9049f679c7817964a6a66e54
parent2a0aa84713216aebab93034fbf29be902880f1dd (diff)
* win32/enc-setup.mak: extracts BUILTIN_ENCOBJS.
* tool/compile_prelude.rb: needs srcdir. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14272 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--tool/compile_prelude.rb2
-rw-r--r--win32/enc-setup.mak4
3 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 55499b46c09..4889ad01a66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Dec 17 21:41:25 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * win32/enc-setup.mak: extracts BUILTIN_ENCOBJS.
+
+ * tool/compile_prelude.rb: needs srcdir.
+
Mon Dec 17 21:24:04 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
* common.mk (miniprelude.c): add -I$(srcdir).
diff --git a/tool/compile_prelude.rb b/tool/compile_prelude.rb
index 6a8d9e1695c..4a2c2ea8319 100644
--- a/tool/compile_prelude.rb
+++ b/tool/compile_prelude.rb
@@ -4,6 +4,8 @@
# Since $(BASERUBY) may be older than Ruby 1.9,
# Ruby 1.9 feature should not be used.
+$:.unshift(File.expand_path("../..", __FILE__))
+
preludes = ARGV.dup
outfile = preludes.pop
diff --git a/win32/enc-setup.mak b/win32/enc-setup.mak
new file mode 100644
index 00000000000..4c2727222b0
--- /dev/null
+++ b/win32/enc-setup.mak
@@ -0,0 +1,4 @@
+!include $(srcdir)/enc/Makefile.in
+
+all:
+ @echo BUILTIN_ENCOBJS = $(BUILTIN_ENCS:.c=.obj) >> $(MAKEFILE)