diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-17 09:38:38 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-17 09:38:38 +0000 |
| commit | 023eab52018a87a63a465aa73d25a58162115663 (patch) | |
| tree | 726ef081ae1b9bf0cfda3269d8e0a75ab22ea5da /enc | |
| parent | a7de3755047fb697e0b3d292a3713145c7e04447 (diff) | |
| download | bundler-023eab52018a87a63a465aa73d25a58162115663.tar.gz | |
* win32/Makefile.sub (MAKEDIRS): should not include silent flag.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29818 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc')
| -rw-r--r-- | enc/Makefile.in | 2 | ||||
| -rw-r--r-- | enc/depend | 4 | ||||
| -rwxr-xr-x | enc/make_encmake.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/enc/Makefile.in b/enc/Makefile.in index 61a3dde7f1..a37541d000 100644 --- a/enc/Makefile.in +++ b/enc/Makefile.in @@ -63,7 +63,7 @@ MAKEDIRS = @MAKEDIRS@ all: make-workdir make-workdir: - $(MAKEDIRS) $(WORKDIRS) + $(Q) $(MAKEDIRS) $(WORKDIRS) clean: diff --git a/enc/depend b/enc/depend index d82988c9c4..23f7bd2922 100644 --- a/enc/depend +++ b/enc/depend @@ -123,13 +123,13 @@ $(TRANSOBJS): ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma. % cmd.sub!(/\$\(DEFFILE\)/) {df} % cmd.gsub!(/-(?:implib|pdb):/) {|s|"#{s}enc/#{e.sub(/[^\/]+\z/, '')}"} % end - @$(MAKEDIRS) "$(@D)" + $(Q) $(MAKEDIRS) "$(@D)" $(Q) <%=cmd%> % end % dependencies.each do |e| <%="enc/#{e}.$(OBJEXT)"%>: <%="$(encsrcdir)/#{e}.c"%> - -@$(MAKEDIRS) "$(@D)" + -$(Q) $(MAKEDIRS) "$(@D)" $(ECHO) compiling <%= "#{e}.c"%> $(Q) <%=COMPILE_C.gsub(/\$(\()?<(\:[^)]+)?(\))?/){"$(encsrcdir)/#{e}.c"}%> diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb index 107a387571..ed3680313f 100755 --- a/enc/make_encmake.rb +++ b/enc/make_encmake.rb @@ -9,7 +9,7 @@ if $".grep(/mkmf/).empty? end require 'erb' -CONFIG["MAKEDIRS"] ||= '@$(MINIRUBY) -run -e mkdir -- -p' +CONFIG["MAKEDIRS"] ||= '$(MINIRUBY) -run -e mkdir -- -p' BUILTIN_ENCS = [] BUILTIN_TRANSES = [] |