Skip to content

Commit

Permalink
* enc/depend: add space at the begginig of @ignore_error.
Browse files Browse the repository at this point in the history
* lib/mkmf.rb: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28883 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nurse committed Aug 6, 2010
1 parent f3372c2 commit 775188a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Fri Aug 6 17:42:12 2010 NARUSE, Yui <[email protected]>

* enc/depend: add space at the begginig of @ignore_error.

* lib/mkmf.rb: ditto.

Fri Aug 6 17:38:33 2010 NARUSE, Yui <[email protected]>

* common.mk (clean): add prelude.c, config.log, and rbconfig.rb.
Expand Down
2 changes: 1 addition & 1 deletion enc/depend
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/mkmf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1813,7 +1813,7 @@ def create_makefile(target, srcprefix = nil)
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}"
Expand Down

0 comments on commit 775188a

Please sign in to comment.