diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1999-02-09 08:10:57 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1999-02-09 08:10:57 +0000 |
commit | d148ffef297193fe5f6639a8bd8c9ee3d3374479 (patch) | |
tree | c30218afcb376b8b42cf91483cea8567fdcfb216 | |
parent | 115eb4595cea72226ec8acd357e7c403e2c4b04a (diff) |
990209
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_3@396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | configure | 1 | ||||
-rw-r--r-- | ext/extmk.rb.in | 4 | ||||
-rw-r--r-- | instruby.rb | 2 | ||||
-rw-r--r-- | lib/mkmf.rb | 1 | ||||
-rw-r--r-- | parse.c | 1 | ||||
-rw-r--r-- | parse.y | 1 |
6 files changed, 4 insertions, 6 deletions
@@ -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 diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index feee1c6d94..6ddd45231b 100644 --- a/ext/extmk.rb.in +++ b/ext/extmk.rb.in @@ -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@ diff --git a/instruby.rb b/instruby.rb index 4839b5ef3b..f06b212957 100644 --- a/instruby.rb +++ b/instruby.rb @@ -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 diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 7e131fe890..0e7595531f 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -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"] @@ -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; @@ -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; |