From 22c81db9d8bd5087e4c1a0d4771873ad7d58ad88 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 29 Aug 2012 06:03:09 +0000 Subject: configure.in: use configured libdir value * configure.in (LIBDIR_BASENAME): use configured libdir value to fix --enable-load-relative on systems where libdir is not default value, overridden in config.site files. [ruby-core:47267] [Bug #6903] * ruby.c (ruby_init_loadpath_safe): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36847 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ruby.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ruby.c') diff --git a/ruby.c b/ruby.c index 0fc524708a..2fbd48f974 100644 --- a/ruby.c +++ b/ruby.c @@ -412,7 +412,11 @@ ruby_init_loadpath_safe(int safe_level) p = strrchr(libpath, '/'); if (p) { static const char bindir[] = "/bin"; +#ifdef LIBDIR_BASENAME + static const char libdir[] = "/"LIBDIR_BASENAME; +#else static const char libdir[] = "/lib"; +#endif const ptrdiff_t bindir_len = (ptrdiff_t)sizeof(bindir) - 1; const ptrdiff_t libdir_len = (ptrdiff_t)sizeof(libdir) - 1; *p = 0; -- cgit v1.2.3