зеркало из https://github.com/github/ruby.git
configure.in: RUBY_VERSION_NAME
* configure.in (RUBY_VERSION_NAME), template/ruby.pc.in: add substitution and define. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39106 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
85aae4c658
Коммит
d32b122996
|
@ -1,4 +1,7 @@
|
|||
Wed Feb 6 17:32:41 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
Wed Feb 6 17:32:46 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* configure.in (RUBY_VERSION_NAME), template/ruby.pc.in: add
|
||||
substitution and define.
|
||||
|
||||
* configure.in, version.c: parametric architecture name for paths.
|
||||
|
||||
|
|
|
@ -205,7 +205,9 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
|
|||
RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"`
|
||||
AC_SUBST(RUBY_BASE_NAME)
|
||||
AC_SUBST(RUBYW_BASE_NAME)
|
||||
AC_SUBST(RUBY_VERSION_NAME, '${RUBY_BASE_NAME}-${ruby_version}')
|
||||
AC_DEFINE_UNQUOTED(RUBY_BASE_NAME, "${RUBY_BASE_NAME}" !<verconf>!)
|
||||
AC_DEFINE_UNQUOTED(RUBY_VERSION_NAME, RUBY_BASE_NAME"-"RUBY_LIB_VERSION !<verconf>!)
|
||||
|
||||
AC_CANONICAL_TARGET
|
||||
target_os=`echo $target_os | sed 's/linux-gnu$/linux/;s/linux-gnu/linux-/'`
|
||||
|
@ -3309,7 +3311,7 @@ fi
|
|||
AC_ARG_WITH(rubyhdrdir,
|
||||
AS_HELP_STRING([--with-rubyhdrdir=DIR], [core headers in DIR [[INCLUDEDIR/RUBY_BASE_NAME-RUBY_VERSION]]]),
|
||||
[rubyhdrdir=$withval],
|
||||
[rubyhdrdir='${includedir}/${RUBY_BASE_NAME}-${ruby_version}'])
|
||||
[rubyhdrdir='${includedir}/${RUBY_VERSION_NAME}'])
|
||||
|
||||
AC_ARG_WITH(sitehdrdir,
|
||||
AS_HELP_STRING([--with-sitehdrdir=DIR], [core site headers in DIR [[RUBYHDRDIR/site_ruby]]]),
|
||||
|
|
|
@ -11,6 +11,7 @@ TEENY=@TEENY@
|
|||
ruby_version=@ruby_version@
|
||||
RUBY_PROGRAM_VERSION=@RUBY_PROGRAM_VERSION@
|
||||
RUBY_BASE_NAME=@RUBY_BASE_NAME@
|
||||
RUBY_VERSION_NAME=@RUBY_VERSION_NAME@
|
||||
RUBY_SO_NAME=@RUBY_SO_NAME@
|
||||
RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
|
||||
DEFFILE=@DEFFILE@
|
||||
|
|
Загрузка…
Ссылка в новой задаче