nobu	2010-03-30 17:52:38 +0900 (Tue, 30 Mar 2010)

  New Revision: 27108

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

  Log:
    * configure.in (RUBY_EXEC_PREFIX, RUBY_LIB_PREFIX): fixed.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/configure.in

Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in	(revision 27107)
+++ ruby_1_8/configure.in	(revision 27108)
@@ -1647,14 +1647,14 @@
 	# fails to consult /usr/local/include by default.  This causes
 	# mkmf.rb's have_header() to fail if the desired resource happens to be
 	# installed in the /usr/local tree.
-	CFLAGS="$CFLAGS -pipe -fno-common"
+	CFLAGS="$CFLAGS -pipe"
 	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
 	;;
     rhapsody*)
-	CFLAGS="$CFLAGS -pipe -no-precomp -fno-common"
+	CFLAGS="$CFLAGS -pipe -no-precomp"
 	;;
     darwin*)
-	CFLAGS="$CFLAGS -pipe -fno-common"
+	CFLAGS="$CFLAGS -pipe"
 	;;
     os2-emx)
     	CFLAGS="$CFLAGS -DOS2"
@@ -1816,10 +1816,12 @@
 
 case "$target_os" in
   cygwin*|mingw*|*djgpp*|os2-emx*)
+    RUBY_EXEC_PREFIX=""
     RUBY_LIB_PREFIX="`eval echo "$RUBY_LIB_PREFIX" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
     RUBY_SITE_LIB_PATH="`eval echo "$SITE_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
     ;;
   *)
+    RUBY_EXEC_PREFIX="`eval echo \\"$exec_prefix/\\" | sed 's|^NONE/|'"$prefix"'/|;s|/$||'`"
     RUBY_LIB_PREFIX="`eval echo \\"$RUBY_LIB_PREFIX\\" | sed 's|^NONE/|'"$prefix"'/|'`"
     RUBY_SITE_LIB_PATH="`eval echo \\"$SITE_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
     ;;
@@ -1828,7 +1830,7 @@
 RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${ruby_version}"
 
 AC_DEFINE_UNQUOTED(RUBY_EXEC_PREFIX, "${RUBY_EXEC_PREFIX}")
-AC_DEFINE_UNQUOTED(RUBY_LIB_PREFIX, ${RUBY_LIB_PREFIX})
+AC_DEFINE_UNQUOTED(RUBY_LIB_PREFIX, "${RUBY_LIB_PREFIX}")
 AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
 AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
 AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 27107)
+++ ruby_1_8/ChangeLog	(revision 27108)
@@ -1,5 +1,7 @@
-Tue Mar 30 15:41:39 2010  Nobuyoshi Nakada  <nobu@r...>
+Tue Mar 30 17:52:32 2010  Nobuyoshi Nakada  <nobu@r...>
 
+	* configure.in (RUBY_EXEC_PREFIX, RUBY_LIB_PREFIX): fixed.
+
 	* common.mk (revision.h): add RUBY_BRANCH_NAME.
 
 	* configure.in (MINIOBJS): use dmydln.o on all platforms.

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