* 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.


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

ChangeLog

@@ -1,4 +1,11 @@
-Wed Mar 25 07:44:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Mar 25 07:45:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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.
 

configure.in

@@ -179,7 +179,12 @@ if test ${target_archs+set}; then
 	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}"

mkconfig.rb

@@ -34,6 +34,7 @@ module RbConfig
 
 ]
 
+arch = RUBY_PLATFORM
 v_fast = []
 v_others = []
 vars = {}
@@ -75,6 +76,7 @@ module RbConfig
     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 @@ module RbConfig
 
 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"