From 4d494a39e710fdcb749083593cef4c1504407f5c Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaron@archlinux.org>
Date: Tue, 13 Feb 2007 00:57:08 +0000
Subject: Fix some x86_64 configuration handling

---
 configure.ac       | 4 ++--
 etc/pacman.conf.in | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index ad3a8110..d3ea3e7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,10 +70,10 @@ case "$host" in
 		CHOST="${host}"
 		;;
 	x86_64-*) AC_DEFINE_UNQUOTED([CARCH], ["x86_64"], [Architecture])
-		AC_DEFINE_UNQUOTED([CARCHFLAGS], ["k8"], [Architecture])
+		AC_DEFINE_UNQUOTED([CARCHFLAGS], ["x86-64"], [Architecture])
 		AC_DEFINE_UNQUOTED([MARCHFLAG], ["march"], [Architecture])
 		CARCH="x86_64"
-		CARCHFLAGS="k8"
+		CARCHFLAGS="x86-64"
 		MARCHFLAG="march"
 		CHOST="${host}"
 		;;
diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in
index fcdd65d8..ec2b54df 100644
--- a/etc/pacman.conf.in
+++ b/etc/pacman.conf.in
@@ -25,7 +25,7 @@ HoldPkg     = pacman glibc
 #     have identical names, regardless of version number
 #
 #[testing]
-#Server = ftp://ftp.archlinux.org/testing/os/i686
+#Server = ftp://ftp.archlinux.org/testing/os/@CARCH@
 
 [current]
 # Add your preferred servers here, they will be used first
-- 
cgit v1.2.3-24-g4f1b