summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-11 01:20:20 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-11 01:20:20 +0000
commit726c93d0b7518de22d326ed498e97c830b674187 (patch)
tree64f18a457a6d951b471b43b282e57c98be6ea7d8
parent1584d7a7f1f0c5c3ec7211ef4d259c11f0297422 (diff)
* lib/mkmf.rb (CLEANINGS): uses escaped form tabs to preventing the
confusion. [ruby-talk:317345] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@19756 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/mkmf.rb16
-rw-r--r--version.h6
3 files changed, 16 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 8c201ef768..99b28d0a8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct 11 10:20:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (CLEANINGS): uses escaped form tabs to preventing the
+ confusion. [ruby-talk:317345]
+
Fri Oct 10 11:34:00 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* time.c (time_mdump, time_mload): preserves GMT status.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 4bf741d420..435f7dcd2a 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1287,7 +1287,7 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
else
sep = ""
end
- extconf_h = $extconf_h ? "-DRUBY_EXTCONF_H=\\\"$(RUBY_EXTCONF_H)\\\" " : $defs.join(" ")<<" "
+ extconf_h = $extconf_h ? "-DRUBY_EXTCONF_H=\\\"$(RUBY_EXTCONF_H)\\\" " : $defs.join(" ") << " "
mk << %{
CC = #{CONFIG['CC']}
LIBRUBY = #{CONFIG['LIBRUBY']}
@@ -1497,8 +1497,8 @@ TARGET_SO = #{($extout ? '$(RUBYARCHDIR)/' : '')}$(DLLIB)
CLEANLIBS = #{n}.#{CONFIG['DLEXT']} #{config_string('cleanlibs') {|t| t.gsub(/\$\*/) {n}}}
CLEANOBJS = *.#{$OBJEXT} #{config_string('cleanobjs') {|t| t.gsub(/\$\*/, '$(TARGET)')}} *.bak
-all: #{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"}
-static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
+all: #{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"}
+static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
"
mfile.print CLEANINGS
dirs = []
@@ -1808,13 +1808,13 @@ MAIN_DOES_NOTHING = config_string('MAIN_DOES_NOTHING') || 'int main() {return 0;
sep = config_string('BUILD_FILE_SEPARATOR') {|sep| ":/=#{sep}" if sep != "/"} || ""
CLEANINGS = "
clean:
- @-$(RM) $(CLEANLIBS#{sep}) $(CLEANOBJS#{sep}) $(CLEANFILES#{sep})
+\t@-$(RM) $(CLEANLIBS#{sep}) $(CLEANOBJS#{sep}) $(CLEANFILES#{sep})
-distclean: clean
- @-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
- @-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES#{sep})
+distclean: clean
+\t@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+\t@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES#{sep})
-realclean: distclean
+realclean: distclean
"
if not $extmk and /\A(extconf|makefile).rb\z/ =~ File.basename($0)
diff --git a/version.h b/version.h
index 13b1fe57f9..2c7680f1c4 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-10-10"
+#define RUBY_RELEASE_DATE "2008-10-11"
#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20081010
+#define RUBY_RELEASE_CODE 20081011
#define RUBY_PATCHLEVEL 5000
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 11
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];