X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=acinclude.m4;h=24746355090ebe3ebf4af914fdaf51a562d91cfc;hp=69739b1908211d8e2abaf7005608478353f90526;hb=5790bf7cd0bcf3a9bf6d364e9bc6601b30feff8b;hpb=1afcbc944110ab22a23e83b52b7e5667c2567398

diff --git a/acinclude.m4 b/acinclude.m4
index 69739b1..2474635 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -892,6 +892,8 @@ if test "$enable_obsolete" = "yes"; then
 	WITH_OBSOLETE=YES
 fi
 
+HOST_CPU="$host_cpu"
+
 if test "x$with_bsd_kernel_headers" != "x"; then
 	BSD_KERNEL_PATH="$with_bsd_kernel_headers"
 else
@@ -902,11 +904,11 @@ if test "x$with_bsd_kernel_build" != "x"; then
 	BSD_KERNEL_BUILD="$with_bsd_kernel_build"
 else
 	case $AFS_SYSNAME in
-		i386_fbsd_4?)
+		*_fbsd_4?)
 			BSD_KERNEL_BUILD="${BSD_KERNEL_PATH}/compile/GENERIC"
 			;;
-		i386_fbsd_*)
-			BSD_KERNEL_BUILD="${BSD_KERNEL_PATH}/i386/compile/GENERIC"
+		*_fbsd_*)
+			BSD_KERNEL_BUILD="${BSD_KERNEL_PATH}/${HOST_CPU}/compile/GENERIC"
 			;;
 	esac
 fi
@@ -1078,6 +1080,7 @@ AC_SUBST(AFS_PARAM_COMMON)
 AC_SUBST(ENABLE_KERNEL_MODULE)
 AC_SUBST(LIB_AFSDB)
 AC_SUBST(LINUX_KERNEL_PATH)
+AC_SUBST(HOST_CPU)
 AC_SUBST(BSD_KERNEL_PATH)
 AC_SUBST(BSD_KERNEL_BUILD)
 AC_SUBST(LINUX_VERSION)