1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure.in: adjust libdirname

Browse Source 
* configure.in (libdirname): adjust library path name which libruby
  files will be installed.  [Bug #7874]
* tool/rbinstall.rb (libdir): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39333 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-02-20 09:01:17 +00:00
parent 206d1c8907
commit 67ab6e3d9b
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Wed Feb 20 18:01:14 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (libdirname): adjust library path name which libruby
files will be installed. [Bug #7874]
* tool/rbinstall.rb (libdir): ditto.
Wed Feb 20 13:37:00 2013 Zachary Scott <zachary@zacharyscott.net> Wed Feb 20 13:37:00 2013 Zachary Scott <zachary@zacharyscott.net>
* ext/pty/pty.c: Documentation for the PTY module * ext/pty/pty.c: Documentation for the PTY module

1
configure.in
View File

@ -3422,6 +3422,7 @@ else
AC_DEFINE_UNQUOTED(RUBY_VENDOR_ARCH_LIB_FOR(arch), ${RUBY_VENDOR_ARCH_LIB_FOR} !<verconf>!) AC_DEFINE_UNQUOTED(RUBY_VENDOR_ARCH_LIB_FOR(arch), ${RUBY_VENDOR_ARCH_LIB_FOR} !<verconf>!)
fi fi
AC_SUBST(libdirname, ${multiarch+arch}libdir)
AC_SUBST(archlibdir)dnl AC_SUBST(archlibdir)dnl
AC_SUBST(sitearchlibdir)dnl AC_SUBST(sitearchlibdir)dnl
AC_SUBST(archincludedir)dnl AC_SUBST(archincludedir)dnl

2
tool/rbinstall.rb
View File

@ -304,7 +304,7 @@ rubyw_install_name = CONFIG["rubyw_install_name"]
goruby_install_name = "go" + ruby_install_name goruby_install_name = "go" + ruby_install_name
bindir = CONFIG["bindir", true] bindir = CONFIG["bindir", true]
libdir = CONFIG["libdir", true] libdir = CONFIG[COFNIG["libdirname", true], true]
rubyhdrdir = CONFIG["rubyhdrdir", true] rubyhdrdir = CONFIG["rubyhdrdir", true]
archhdrdir = CONFIG["rubyarchhdrdir"] || (rubyhdrdir + "/" + CONFIG['arch']) archhdrdir = CONFIG["rubyarchhdrdir"] || (rubyhdrdir + "/" + CONFIG['arch'])
rubylibdir = CONFIG["rubylibdir", true] rubylibdir = CONFIG["rubylibdir", true]