diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | template/ruby.pc.in | 1 |
3 files changed, 8 insertions, 2 deletions
@@ -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. diff --git a/configure.in b/configure.in index cff998d53d..d8cb3a451e 100644 --- a/configure.in +++ b/configure.in @@ -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]]]), diff --git a/template/ruby.pc.in b/template/ruby.pc.in index 2d6716c73c..7bb9c0d17c 100644 --- a/template/ruby.pc.in +++ b/template/ruby.pc.in @@ -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@ |