summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-15 08:53:07 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-15 08:53:07 +0000
commitce744b08613cf11bc253a487658af6ddf00755bb (patch)
treedad0d7f28e1d63407d3e8823882dac56f17a582e
parent4c4c21ed0c9e118a7281180a452f397784ba066f (diff)
downloadruby-ce744b08613cf11bc253a487658af6ddf00755bb.tar.gz
ruby-ce744b08613cf11bc253a487658af6ddf00755bb.tar.xz
ruby-ce744b08613cf11bc253a487658af6ddf00755bb.zip
* enc/Makefile.in: ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--enc/Makefile.in4
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 73a7a9cd4..2cb4c1b2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
-Tue Jan 15 17:26:51 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Jan 15 17:53:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* enc/utf_8.c: renamed as IANA name.
+ * enc/Makefile.in: ditto.
+
Tue Jan 15 16:59:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.c (proc_options): encoding libraries cannot be loaded until
diff --git a/enc/Makefile.in b/enc/Makefile.in
index a1f9142a1..cafeff964 100644
--- a/enc/Makefile.in
+++ b/enc/Makefile.in
@@ -15,7 +15,7 @@ DLEXT = @DLEXT@
OBJEXT = @OBJEXT@
BUILTIN_ENCS = ascii.c us_ascii.c\
- unicode.c utf8.c
+ unicode.c utf_8.c
RUBY_SO_NAME = @RUBY_SO_NAME@
LIBRUBY = @LIBRUBY@
@@ -34,7 +34,7 @@ CPPFLAGS = @CPPFLAGS@ -DONIG_ENC_REGISTER=rb_enc_register
LDFLAGS = @LDFLAGS@
LIBS = @LIBRUBYARG@ @LIBS@ $(EXTLIBS)
LDSHARED = @LDSHARED@
-ldflags = $(CFLAGS) $(LDFLAGS)
+ldflags = $(LDFLAGS)
dldflags = @DLDFLAGS@
archflag = @ARCH_FLAG@
DLDFLAGS = $(ldflags) $(dldflags) $(archflag)