From 9bd7249fa50786e67b647b5410ef09dc8c5e6c73 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 20 Mar 2009 00:23:01 +0000 Subject: * configure.in (libprefix): must not append "lib" after $(libdir), when load_relative is not used on darwin. [ruby-dev:38182] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23013 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ configure.in | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d49cd3dcf..a732ed67b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Mar 20 09:22:59 2009 Nobuyoshi Nakada + + * configure.in (libprefix): must not append "lib" after $(libdir), + when load_relative is not used on darwin. [ruby-dev:38182] + Thu Mar 19 20:29:40 2009 Tanaka Akira * io.c (rb_mWaitReadable): defined. diff --git a/configure.in b/configure.in index 8309d537ee..2320703b46 100644 --- a/configure.in +++ b/configure.in @@ -1978,11 +1978,11 @@ if test "$enable_shared" = 'yes'; then RUBY_SO_NAME="$RUBY_SO_NAME"'.$(MAJOR).$(MINOR).$(TEENY)' LIBRUBY_LDSHARED='cc -dynamiclib -undefined suppress -flat_namespace' if test "$load_relative" = yes; then - libprefix='@executable_path/..' + libprefix='@executable_path/../lib' else libprefix='$(libdir)' fi - LIBRUBY_DLDFLAGS='-install_name '${libprefix}'/lib/lib$(RUBY_SO_NAME).dylib' + LIBRUBY_DLDFLAGS='-install_name '${libprefix}'/lib$(RUBY_SO_NAME).dylib' LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(MAJOR).$(MINOR).$(TEENY)' LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-compatibility_version $(MAJOR).$(MINOR).$(TEENY)' LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,_Init_* $(XLDFLAGS)' -- cgit v1.2.3