nobu	2009-03-25 07:45:13 +0900 (Wed, 25 Mar 2009)

  New Revision: 23068

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

  Log:
    * configure.in (target_alias): replaces cpu with universal too.
    * configure.in (target): replaces cpu with arch by --with-arch.
    
    * mkconfig.rb (TOPDIR): chops arch in config instead of
      RUBY_PLATFORM which varies on universal_binary.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
    trunk/mkconfig.rb

Index: configure.in
===================================================================
--- configure.in	(revision 23067)
+++ configure.in	(revision 23068)
@@ -179,7 +179,12 @@
 	RUBY_PREREQ_AC(2.63, [ to compile universal binary])
 	AC_SUBST(try_header,try_compile)
 	target=`echo $target | sed "s/^$target_cpu-/universal-/"`
+	target_alias=`echo $target_alias | sed "s/^$target_cpu-/universal-/"`
 	target_cpu=universal
+    else
+	target=`echo $target | sed "s/^$target_cpu-/${target_archs}-/"`
+	target_alias=`echo $target_alias | sed "s/^$target_cpu-/${target_archs}-/"`
+	target_cpu=${target_archs}
     fi
     CFLAGS="$CFLAGS ${ARCH_FLAG}"
     LDFLAGS="${LDFLAGS+$LDFLAGS }${ARCH_FLAG}"
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 23067)
+++ ChangeLog	(revision 23068)
@@ -1,5 +1,12 @@
-Wed Mar 25 07:44:13 2009  Nobuyoshi Nakada  <nobu@r...>
+Wed Mar 25 07:45:12 2009  Nobuyoshi Nakada  <nobu@r...>
 
+	* configure.in (target_alias): replaces cpu with universal too.
+
+	* configure.in (target): replaces cpu with arch by --with-arch.
+
+	* mkconfig.rb (TOPDIR): chops arch in config instead of
+	  RUBY_PLATFORM which varies on universal_binary.
+
 	* mkconfig.rb (MAJOR, MINOR, TEENY): reads from version.h always.
 
 Tue Mar 24 19:23:44 2009  Nobuyoshi Nakada  <nobu@r...>
Index: mkconfig.rb
===================================================================
--- mkconfig.rb	(revision 23067)
+++ mkconfig.rb	(revision 23068)
@@ -34,6 +34,7 @@
 
 ]
 
+arch = RUBY_PLATFORM
 v_fast = []
 v_others = []
 vars = {}
@@ -75,6 +76,7 @@
     next if $install_name and /^RUBY_INSTALL_NAME$/ =~ name
     next if $so_name and /^RUBY_SO_NAME$/ =~  name
     next if /^(?:X|(?:MINI|RUN)RUBY$)/ =~ name
+    arch = val if name == "arch"
     if /^program_transform_name$/ =~ name and /^s(\\?.)(.*)\1$/ =~ val
       next if $install_name
       sep = %r"#{Regexp.quote($1)}"
@@ -104,7 +106,7 @@
 
 drive = File::PATH_SEPARATOR == ';'
 
-prefix = "/lib/ruby/#{version}/#{RUBY_PLATFORM}"
+prefix = "/lib/ruby/#{version}/#{arch}"
 print "  TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n"
 print "  DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n"
 print "  CONFIG = {}\n"

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