* configure.in (--with-ruby-version): Add a new option to specify

  the ruby version string for version specific directories.
  [ruby-dev:35490]

* mkconfig.rb: Definition of ruby_version is now determined by the
  configure script.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@18074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 35 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 216d3459ef..3f2e0f6868 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Jul 15 21:34:13 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* configure.in (--with-ruby-version): Add a new option to specify
+	  the ruby version string for version specific directories.
+	  [ruby-dev:35490]
+
+	* mkconfig.rb: Definition of ruby_version is now determined by the
+	  configure script.
+
 Mon Jul 14 06:02:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/optparse.rb (OptionParser#environment): requires shellwords.
diff --git a/NEWS b/NEWS
index 2a3ba7bffa..cdcadc5895 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,15 @@ with all sufficient information, see the ChangeLog file.
 
 == Changes since the 1.8.7 release
 
+=== Configuration changes
+
+* version specific directories
+
+  A new configure option --with-ruby-version is added, which allows
+  user to specify the version string (defaulted to "1.8") for version
+  specific directories such as library directories, ri directories and
+  gem directories.
+
 === Library updates (outstanding ones only)
 
 * set
diff --git a/configure.in b/configure.in
index 8738b3c518..da142372f2 100644
--- a/configure.in
+++ b/configure.in
@@ -1751,6 +1751,19 @@ case "$target_os" in
 esac
 RUBY_LIB_PREFIX=`eval echo \\"${libdir}/ruby\\"`
 
+AC_ARG_WITH(ruby-version,
+	    [  --with-ruby-version=STR ruby version string for version specific directories [[minor]] (full|minor|STR)],
+            [ruby_version=$withval],
+            [ruby_version=minor])
+case "$ruby_version" in
+  full)
+    ruby_version="${MAJOR}.${MINOR}.${TEENY}"
+    ;;
+  minor)
+    ruby_version="${MAJOR}.${MINOR}"
+    ;;
+esac
+
 AC_ARG_WITH(sitedir,
 	    [  --with-sitedir=DIR      site libraries in DIR [[LIBDIR/ruby/site_ruby]]],
             [sitedir=$withval],
@@ -1767,8 +1780,8 @@ case "$target_os" in
     RUBY_SITE_LIB_PATH="`eval echo \\"$SITE_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
     ;;
 esac
-RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
-RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
+RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${ruby_version}"
+RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${ruby_version}"
 
 AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
 AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
@@ -1787,13 +1800,14 @@ case "$target_os" in
     RUBY_VENDOR_LIB_PATH="`eval echo \\"$VENDOR_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
     ;;
 esac
-RUBY_VENDOR_LIB_PATH2="${RUBY_VENDOR_LIB_PATH}/${MAJOR}.${MINOR}"
+RUBY_VENDOR_LIB_PATH2="${RUBY_VENDOR_LIB_PATH}/${ruby_version}"
 
 AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, "${RUBY_VENDOR_LIB_PATH}")
 AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB2, "${RUBY_VENDOR_LIB_PATH2}")
 
 AC_SUBST(arch)dnl
 AC_SUBST(sitearch)dnl
+AC_SUBST(ruby_version)dnl
 AC_SUBST(sitedir)dnl
 AC_SUBST(vendordir)dnl
 
diff --git a/mkconfig.rb b/mkconfig.rb
index 255bfa7436..d3602516f9 100755
--- a/mkconfig.rb
+++ b/mkconfig.rb
@@ -140,7 +140,6 @@ end
 print(*v_fast)
 print(*v_others)
 print <<EOS
-  CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
   CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
   CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
   CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"