diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-02 13:30:49 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-02 13:30:49 +0000 |
commit | 29798fee394f350cb8f95acedfdbf82a7e92de62 (patch) | |
tree | 80385ede512422f8f07f436d17b6984860da28d2 /lib/mkmf.rb | |
parent | b872b799466954709c63a6d98dbd25a199ebfcbf (diff) |
* configure.in (CP, INSTALL): get rid of less portable options.
* lib/mkmf.rb (configuration, create_makefile): correct configuration
variable.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8241 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/mkmf.rb')
-rw-r--r-- | lib/mkmf.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 3c4d5f54ac..e902b143c3 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -887,11 +887,11 @@ ruby_version = #{Config::CONFIG['ruby_version']} ruby = #{$ruby} RUBY = #{($nmake && !$extmk && !$configure_args.has_key?('--ruby')) ? '$(ruby:/=\)' : '$(ruby)'} RM = #{config_string('RM') || '$(RUBY) -run -e rm -- -f'} -MAKEDIRS = #{config_string('MAKEDIRS') || '$(RUBY) -run -e mkdir -- -p'} -INSTALL = #{config_string('INSTALL') || '$(RUBY) -run -e install -- -vp'} +MAKEDIRS = #{config_string('MAKEDIRS') || '@$(RUBY) -run -e mkdir -- -p'} +INSTALL = #{config_string('INSTALL') || '@$(RUBY) -run -e install -- -vp'} INSTALL_PROG = $(INSTALL) -m 0755 INSTALL_DATA = $(INSTALL) -m 0644 -COPY = #{config_string('COPY') || '$(RUBY) -run -e cp -- -v'} +COPY = #{config_string('CP') || '@$(RUBY) -run -e cp -- -v'} #### End of system configuration section. #### @@ -1020,7 +1020,7 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} dest = "#{dir}/#{f}" mfile.print "install-so: #{dest}\n" unless $extout - mfile.print "#{dest}: #{f}\n\t@$(INSTALL_PROG) #{f} #{dir}\n" + mfile.print "#{dest}: #{f}\n\t$(INSTALL_PROG) #{f} #{dir}\n" end end dirs << (dir = "$(RUBYLIBDIR)") @@ -1036,12 +1036,12 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} files.each do |f| dest = "#{dir}/#{File.basename(f)}" mfile.print("install-rb#{sfx}: #{dest}\n") - mfile.print("#{dest}: #{f}\n\t@$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} #{dir}\n") + mfile.print("#{dest}: #{f}\n\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} #{dir}\n") end end end dirs.unshift(sodir) if target and !dirs.include?(sodir) - dirs.each {|dir| mfile.print "#{dir}:\n\t@$(MAKEDIRS) $@\n"} + dirs.each {|dir| mfile.print "#{dir}:\n\t$(MAKEDIRS) $@\n"} mfile.print <<-SITEINSTALL |