1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

2000-06-19

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@766 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eban 2000-06-19 03:37:55 +00:00
parent cc05dcd5fe
commit c613f625b7
5 changed files with 35 additions and 8 deletions

View file

@ -1,3 +1,14 @@
Sun Jun 18 22:49:13 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
* configure.in: single quoted sitedir.
* mkconfig.rb: add DESTDIR for cross-compiling.
* lib/mkmf.rb: add DESTDIR.
* ruby.c (load_file): force binmode if fname includes ".exe"
on DOSISH.
Fri Jun 16 22:47:47 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.23.

View file

@ -866,7 +866,7 @@ test "$program_suffix" != NONE &&
RUBY_INSTALL_NAME="${ri_prefix}ruby${ri_suffix}"
RUBY_LIB_PREFIX="${prefix}/lib/ruby"
RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
sitedir="${prefix}/lib/ruby/site_ruby"
sitedir='${prefix}/lib/ruby/site_ruby'
AC_ARG_WITH(sitedir,
[--with-sitedir=DIR site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
[sitedir=$withval])

View file

@ -381,12 +381,13 @@ LDSHARED = #{CONFIG["LDSHARED"]} #{defflag}
RUBY_INSTALL_NAME = #{CONFIG["RUBY_INSTALL_NAME"]}
prefix = #{CONFIG["prefix"]}
exec_prefix = #{CONFIG["exec_prefix"]}
libdir = #{$libdir}
archdir = #{$archdir}
sitelibdir = #{$sitelibdir}
sitearchdir = #{$sitearchdir}
DESTDIR =
prefix = $(DESTDIR)#{CONFIG["prefix"]}
exec_prefix = $(DESTDIR)#{CONFIG["exec_prefix"]}
libdir = $(DESTDIR)#{$libdir}
archdir = $(DESTDIR)#{$archdir}
sitelibdir = $(DESTDIR)#{$sitelibdir}
sitearchdir = $(DESTDIR)#{$sitearchdir}
#### End of system configuration section. ####

View file

@ -20,7 +20,7 @@ module Config
# made to this file will be lost the next time ruby is built.
]
print " CONFIG = {}\n"
print " DESTDIR = '' if not defined? DESTDIR\n CONFIG = {}\n"
v_fast = []
v_others = []
has_version = false
@ -72,6 +72,14 @@ if not has_version
}
end
v_fast.collect! do |x|
if /"prefix"/ === x
x.sub(/= /, '= DESTDIR + ')
else
x
end
end
print v_fast, v_others
print <<EOS
CONFIG["compile_dir"] = "#{Dir.pwd}"

7
ruby.c
View file

@ -679,6 +679,13 @@ load_file(fname, script)
fclose(fp);
f = rb_file_open(fname, "r");
#if defined DOSISH || defined __CYGWIN__
{
char *ext = strrchr(fname, '.');
if (ext && strcasecmp(ext, ".exe") == 0)
rb_io_binmode(f);
}
#endif
}
if (script) {