diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-30 08:52:38 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-30 08:52:38 +0000 |
| commit | bdb4e343bc2e01d555d51152534b28e561fb5f64 (patch) | |
| tree | d1987bd768a465c33c00c02d8dcfa2f3dfab9190 | |
| parent | 833393f9506b641a8d5039fa82e967fd0de59ccc (diff) | |
* configure.in (RUBY_EXEC_PREFIX, RUBY_LIB_PREFIX): fixed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@27108 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 10 |
2 files changed, 9 insertions, 5 deletions
@@ -1,4 +1,6 @@ -Tue Mar 30 15:41:39 2010 Nobuyoshi Nakada <[email protected]> +Tue Mar 30 17:52:32 2010 Nobuyoshi Nakada <[email protected]> + + * configure.in (RUBY_EXEC_PREFIX, RUBY_LIB_PREFIX): fixed. * common.mk (revision.h): add RUBY_BRANCH_NAME. diff --git a/configure.in b/configure.in index d747ff9e4e..2e4d47603c 100644 --- a/configure.in +++ b/configure.in @@ -1647,14 +1647,14 @@ case "$target_os" in # 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 @@ SITE_DIR=`eval echo \\"${sitedir}\\"` 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_LIB_PATH="${RUBY_LIB_PREFIX}/${ruby_version}" 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}") |