nobu	2009-03-20 09:23:01 +0900 (Fri, 20 Mar 2009)

  New Revision: 23013

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23013

  Log:
    * configure.in (libprefix): must not append "lib" after $(libdir),
      when load_relative is not used on darwin.  [ruby-dev:38182]

  Modified files:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 23012)
+++ configure.in	(revision 23013)
@@ -1978,11 +1978,11 @@
 	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)'
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 23012)
+++ ChangeLog	(revision 23013)
@@ -1,3 +1,8 @@
+Fri Mar 20 09:22:59 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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  <akr@f...>
 
 	* io.c (rb_mWaitReadable): defined.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/