akr	2007-11-03 22:30:59 +0900 (Sat, 03 Nov 2007)

  New Revision: 13807

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

  Log:
    * configure.in: --with-vendor-hdrdir implemented.
    
    * lib/mkmf.rb: check --vendor argument.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13807&r2=13806
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/mkmf.rb?r1=13807&r2=13806
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/configure.in?r1=13807&r2=13806

Index: configure.in
===================================================================
--- configure.in	(revision 13806)
+++ configure.in	(revision 13807)
@@ -1657,8 +1657,14 @@
 	    [sitehdrdir=$withval],
 	    [sitehdrdir='${rubyhdrdir}/site_ruby'])
 
+AC_ARG_WITH(vendorhdrdir,
+	    [  --with-vendor-hdrdir=DIR core headers in DIR [INCLUDEDIR]],
+	    [vendorhdrdir=$withval],
+	    [vendorhdrdir='${rubyhdrdir}/vendor_ruby'])
+
 AC_SUBST(rubyhdrdir)dnl
 AC_SUBST(sitehdrdir)dnl
+AC_SUBST(vendorhdrdir)dnl
 
 AC_ARG_WITH(mantype,
 		[  --with-mantype=TYPE specify man page type; TYPE is one of man and doc],
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13806)
+++ ChangeLog	(revision 13807)
@@ -1,3 +1,9 @@
+Sat Nov  3 22:29:35 2007  Tanaka Akira  <akr@f...>
+
+	* configure.in: --with-vendor-hdrdir implemented.
+
+	* lib/mkmf.rb: check --vendor argument.
+
 Sat Nov  3 20:30:48 2007  Tanaka Akira  <akr@f...>
 
 	* configure.in: --with-vendordir implemented.
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 13806)
+++ lib/mkmf.rb	(revision 13807)
@@ -51,6 +51,9 @@
 $sitedir = CONFIG["sitedir"]
 $sitelibdir = CONFIG["sitelibdir"]
 $sitearchdir = CONFIG["sitearchdir"]
+$vendordir = CONFIG["vendordir"]
+$vendorlibdir = CONFIG["vendorlibdir"]
+$vendorarchdir = CONFIG["vendorarchdir"]
 
 $mswin = /mswin/ =~ RUBY_PLATFORM
 $bccwin = /bccwin/ =~ RUBY_PLATFORM
@@ -74,12 +77,16 @@
 INSTALL_DIRS = [
   [dir_re('commondir'), "$(RUBYCOMMONDIR)"],
   [dir_re('sitedir'), "$(RUBYCOMMONDIR)"],
+  [dir_re('vendordir'), "$(RUBYCOMMONDIR)"],
   [dir_re('rubylibdir'), "$(RUBYLIBDIR)"],
   [dir_re('archdir'), "$(RUBYARCHDIR)"],
   [dir_re('sitelibdir'), "$(RUBYLIBDIR)"],
+  [dir_re('vendorlibdir'), "$(RUBYLIBDIR)"],
   [dir_re('sitearchdir'), "$(RUBYARCHDIR)"],
+  [dir_re('vendorarchdir'), "$(RUBYARCHDIR)"],
   [dir_re('rubyhdrdir'), "$(RUBYHDRDIR)"],
   [dir_re('sitehdrdir'), "$(SITEHDRDIR)"],
+  [dir_re('vendorhdrdir'), "$(VENDORHDRDIR)"],
 ]
 
 def install_dirs(target_prefix = nil)
@@ -101,6 +108,14 @@
       ['HDRDIR',        '$(rubyhdrdir)/ruby$(target_prefix)'],
       ['ARCHHDRDIR',    '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
     ]
+  elsif $configure_args.has_key?('--vendor')
+    dirs = [
+      ['RUBYCOMMONDIR', '$(vendordir)$(target_prefix)'],
+      ['RUBYLIBDIR',    '$(vendorlibdir)$(target_prefix)'],
+      ['RUBYARCHDIR',   '$(vendorarchdir)$(target_prefix)'],
+      ['HDRDIR',        '$(rubyhdrdir)/ruby$(target_prefix)'],
+      ['ARCHHDRDIR',    '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
+    ]
   else
     dirs = [
       ['RUBYCOMMONDIR', '$(sitedir)$(target_prefix)'],

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