summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-06 08:44:33 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-06 08:44:33 +0000
commit775188a0a2d7c186a089cf358c4bbb8449c63783 (patch)
treecd3a828d2dae81d6369b7174d7dcfa15c888a846
parentf3372c22a6c335d73319eac549fa577bc4386b06 (diff)
* enc/depend: add space at the begginig of @ignore_error.
* lib/mkmf.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28883 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--enc/depend2
-rw-r--r--lib/mkmf.rb2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b86f747..5cfda3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Aug 6 17:42:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * enc/depend: add space at the begginig of @ignore_error.
+
+ * lib/mkmf.rb: ditto.
+
Fri Aug 6 17:38:33 2010 NARUSE, Yui <naruse@ruby-lang.org>
* common.mk (clean): add prelude.c, config.log, and rbconfig.rb.
diff --git a/enc/depend b/enc/depend
index 7d19693..ef889157 100644
--- a/enc/depend
+++ b/enc/depend
@@ -132,7 +132,7 @@ clean:
% %w[$(ENCSOS) $(ENCOBJS) $(ENCCLEANOBJS) $(ENCCLEANLIBS) $(TRANSSOS) $(TRANSOBJS) $(TRANSCLEANOBJS) $(TRANSCLEANLIBS)].each do |clean|
@$(RM) <%=pathrep[clean]%>
% end
-% @ignore_error = $nmake ? '' : '2> /dev/null || true'
+% @ignore_error = $nmake ? '' : ' 2> /dev/null || true'
% %w[$(TRANSSODIR) $(ENCSODIR)].each do|dir|
@-$(RMDIR) <%=pathrep[dir]%><%=@ignore_error%>
% end
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index af31d37..f8ca103 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1813,7 +1813,7 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
mfile.print "install: install-so install-rb\n\n"
sodir = (dir = "$(RUBYARCHDIR)").dup
mfile.print("install-so: ")
- @ignore_error = $nmake ? '' : '2> /dev/null || true'
+ @ignore_error = $nmake ? '' : ' 2> /dev/null || true'
if target
f = "$(DLLIB)"
dest = "#{dir}/#{f}"