зеркало из https://github.com/github/ruby.git
* 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/trunk@8241 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
2aa633b268
Коммит
fb707a7704
11
ChangeLog
11
ChangeLog
|
@ -1,3 +1,10 @@
|
|||
Sat Apr 2 22:30:01 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* configure.in (CP, INSTALL): get rid of less portable options.
|
||||
|
||||
* lib/mkmf.rb (configuration, create_makefile): correct configuration
|
||||
variable.
|
||||
|
||||
Sat Apr 2 16:59:46 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
|
||||
|
||||
* ext/tk/lib/tk.rb: forgot to update RELEASE_DATE
|
||||
|
@ -9,7 +16,7 @@ Sat Apr 2 16:59:46 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
|
|||
* ext/tk/lib/tk/dialog.rb: use array2tk_list method when calling
|
||||
Tk.ip_eval.
|
||||
|
||||
* ext/tk/lib/tk/autoload.rb: add autoload entry 'TkDialogObj' and
|
||||
* ext/tk/lib/tk/autoload.rb: add autoload entry 'TkDialogObj' and
|
||||
'TkWarningObj'
|
||||
|
||||
Sat Apr 2 13:23:17 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
|
||||
|
@ -24,7 +31,7 @@ Sat Apr 2 02:19:11 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
|
|||
which is used as an argument of Tcl/Tk's widget allocation commands.
|
||||
|
||||
* ext/tk/lib/tk/image.rb (TkImage.initialize): accept 'imagename'
|
||||
option to create a image object by the given name.
|
||||
option to create a image object by the given name.
|
||||
|
||||
Thu Mar 31 23:52:48 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
|
||||
|
||||
|
|
|
@ -188,8 +188,8 @@ AC_AIX
|
|||
AC_MINIX
|
||||
|
||||
AC_SUBST(RM, ['rm -f'])
|
||||
AC_SUBST(CP, ['cp -v'])
|
||||
AC_SUBST(INSTALL, ['install -vp'])
|
||||
AC_SUBST(CP, ['cp'])
|
||||
AC_SUBST(INSTALL, ['install -p'])
|
||||
if $as_mkdir_p; then
|
||||
AC_SUBST(MAKEDIRS, ['mkdir -p'])
|
||||
else
|
||||
|
|
12
lib/mkmf.rb
12
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
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче