nobu	2013-02-06 17:32:58 +0900 (Wed, 06 Feb 2013)

  New Revision: 39108

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

  Log:
    configure.in: arch dependent header directory options
    
    * configure.in (rubyarchhdrdir, sitearchhdrdir, vendorarchhdrdir): add
      options to customize architecture dependent header directories.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
    trunk/lib/mkmf.rb
    trunk/tool/rbinstall.rb

Index: configure.in
===================================================================
--- configure.in	(revision 39107)
+++ configure.in	(revision 39108)
@@ -3339,19 +3339,40 @@ AC_ARG_WITH(rubyhdrdir, https://github.com/ruby/ruby/blob/trunk/configure.in#L3339
 	    [rubyhdrdir=$withval],
 	    [rubyhdrdir='${includedir}/${RUBY_VERSION_NAME}'])
 
+AC_ARG_WITH(rubyarchhdrdir,
+	    AS_HELP_STRING([--with-arch-rubyhdrdir=DIR],
+			   [architecture dependent core headers in DIR [[$(rubyhdrdir)/$(arch)]]]),
+	    [rubyarchhdrdir=$withval],
+	    [rubyarchhdrdir='${rubyhdrdir}/${arch}'])
+
 AC_ARG_WITH(sitehdrdir,
 	    AS_HELP_STRING([--with-sitehdrdir=DIR], [core site headers in DIR [[RUBYHDRDIR/site_ruby]]]),
 	    [sitehdrdir=$withval],
 	    [sitehdrdir='${rubyhdrdir}/site_ruby'])
 
+AC_ARG_WITH(sitearchhdrdir,
+	    AS_HELP_STRING([--with-arch-sitehdrdir=DIR],
+			   [architecture dependent core site headers in DIR [[RUBYHDRDIR/site_ruby]]]),
+	    [sitearchhdrdir=$withval],
+	    [sitearchhdrdir='${sitehdrdir}/${sitearch}'])
+
 AC_ARG_WITH(vendorhdrdir,
 	    AS_HELP_STRING([--with-vendorhdrdir=DIR], [core vendor headers in DIR [[RUBYHDRDIR/vendor_ruby]]]),
 	    [vendorhdrdir=$withval],
 	    [vendorhdrdir='${rubyhdrdir}/vendor_ruby'])
 
+AC_ARG_WITH(vendorarchhdrdir,
+	    AS_HELP_STRING([--with-arch-vendorhdrdir=DIR],
+			   [architecture dependent core vendor headers in DIR [[RUBYHDRDIR/vendor_ruby]]]),
+	    [vendorarchhdrdir=$withval],
+	    [vendorarchhdrdir='${vendorhdrdir}/${sitearch}'])
+
 AC_SUBST(rubyhdrdir)dnl
 AC_SUBST(sitehdrdir)dnl
 AC_SUBST(vendorhdrdir)dnl
+AC_SUBST(rubyarchhdrdir)dnl
+AC_SUBST(sitearchhdrdir)dnl
+AC_SUBST(vendorarchhdrdir)dnl
 
 AC_ARG_WITH(mantype,
 	AS_HELP_STRING([--with-mantype=TYPE], [specify man page type; TYPE is one of man and doc]),
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 39107)
+++ ChangeLog	(revision 39108)
@@ -1,4 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
-Wed Feb  6 17:32:51 2013  Nobuyoshi Nakada  <nobu@r...>
+Wed Feb  6 17:32:56 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (rubyarchhdrdir, sitearchhdrdir, vendorarchhdrdir): add
+	  options to customize architecture dependent header directories.
 
 	* configure.in (rubyarchprefix, sitearchdir, vendorarchdir): add
 	  options to customize architecture dependent library directories.
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 39107)
+++ lib/mkmf.rb	(revision 39108)
@@ -229,7 +229,7 @@ module MakeMakefile https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L229
     $hdrdir = CONFIG["rubyhdrdir"]
     $topdir = $hdrdir
     $top_srcdir = $hdrdir
-    $arch_hdrdir = "$(hdrdir)/$(arch)"
+    $arch_hdrdir = CONFIG["rubyarchhdrdir"]
   elsif File.exist?(($hdrdir = ($top_srcdir ||= topdir) + "/include")  + "/ruby.h")
     $topdir ||= RbConfig::CONFIG["topdir"]
     $arch_hdrdir = "$(extout)/include/$(arch)"
Index: tool/rbinstall.rb
===================================================================
--- tool/rbinstall.rb	(revision 39107)
+++ tool/rbinstall.rb	(revision 39108)
@@ -305,8 +305,8 @@ goruby_install_name = "go" + ruby_instal https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L305
 
 bindir = CONFIG["bindir", true]
 libdir = CONFIG["libdir", true]
-archhdrdir = rubyhdrdir = CONFIG["rubyhdrdir", true]
-archhdrdir += "/" + CONFIG["arch", true]
+rubyhdrdir = CONFIG["rubyhdrdir", true]
+archhdrdir = CONFIG["rubyarchhdrdir"] || (rubyhdrdir + "/" + $arch)
 rubylibdir = CONFIG["rubylibdir", true]
 archlibdir = CONFIG["rubyarchdir", true]
 sitelibdir = CONFIG["sitelibdir"]

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