mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
990209
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_3@396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
115eb4595c
commit
d148ffef29
6 changed files with 4 additions and 6 deletions
1
configure
vendored
1
configure
vendored
|
|
@ -4309,7 +4309,6 @@ ri_suffix=
|
|||
test "$program_suffix" != NONE &&
|
||||
ri_suffix=$program_suffix
|
||||
|
||||
LIBSUFFIX=$ri_suffix
|
||||
RUBY_INSTALL_NAME="${ri_prefix}ruby${ri_suffix}"
|
||||
RUBY_LIB_PATH="${prefix}/lib/${RUBY_INSTALL_NAME}/${MAJOR}.${MINOR}"
|
||||
cat >> confdefs.h <<EOF
|
||||
|
|
|
|||
|
|
@ -295,12 +295,12 @@ LDSHARED = @LDSHARED@
|
|||
mfile.printf "\
|
||||
|
||||
program_transform_name = -e @program_transform_name@
|
||||
RUBY_INSTALL_NAME = `t='$(program_transform_name)'; echo ruby | sed $$t`
|
||||
RUBY_INSTALL_NAME = `t='$(program_transform_name)'; echo @RUBY_INSTALL_NAME@ | sed $$t`
|
||||
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
libdir = @libdir@
|
||||
pkglibdir = $(libdir)/$(RUBY_INSTALL_NAME)
|
||||
pkglibdir = $(libdir)/$(RUBY_INSTALL_NAME)/@MAJOR@.@MINOR@
|
||||
archdir = $(pkglibdir)/@arch@
|
||||
@SET_MAKE@
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ end
|
|||
ruby_install_name = CONFIG["ruby_install_name"]
|
||||
bindir = destdir+CONFIG["bindir"]
|
||||
libdir = destdir+CONFIG["libdir"]
|
||||
pkglibdir = libdir + "/" + ruby_install_name
|
||||
pkglibdir = libdir + "/" + ruby_install_name+"/"+CONFIG["MAJOR"]+"."+CONFIG["MINOR"]
|
||||
archdir = pkglibdir + "/" + CONFIG["arch"]
|
||||
mandir = destdir+CONFIG["mandir"] + "/man1"
|
||||
wdir = Dir.getwd
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ end
|
|||
|
||||
$srcdir = CONFIG["srcdir"]
|
||||
$libdir = CONFIG["libdir"]+"/"+CONFIG["ruby_install_name"]
|
||||
$libdir += "/"+CONFIG["MAJOR"]+"."+CONFIG["MINOR"]
|
||||
$archdir = $libdir+"/"+CONFIG["arch"]
|
||||
$install = CONFIG["INSTALL_PROGRAM"]
|
||||
$install_data = CONFIG["INSTALL_DATA"]
|
||||
|
|
|
|||
1
parse.c
1
parse.c
|
|
@ -5721,7 +5721,6 @@ retry:
|
|||
}
|
||||
else if (c >= '0' && c <= '7' || c == '_') {
|
||||
/* octal */
|
||||
tokadd(c);
|
||||
do {
|
||||
if (c == '_') continue;
|
||||
if (c < '0' || c > '7') break;
|
||||
|
|
|
|||
1
parse.y
1
parse.y
|
|
@ -2810,7 +2810,6 @@ retry:
|
|||
}
|
||||
else if (c >= '0' && c <= '7' || c == '_') {
|
||||
/* octal */
|
||||
tokadd(c);
|
||||
do {
|
||||
if (c == '_') continue;
|
||||
if (c < '0' || c > '7') break;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue