From 00d1015b18d00e683e21a069baafe76761ebb81b Mon Sep 17 00:00:00 2001
From: Matt Benjamin <matt@linuxbox.com>
Date: Tue, 7 Dec 2004 05:45:26 +0000
Subject: [PATCH] umlinux26-20041202

FIXES 16591

umlinux 26 support. i wonder what i just reverted
setting mps correctly. fixed now

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================
FIXES 16591

umlinux 26 support. i wonder what i just reverted
---
 acinclude.m4                      |  7 +++----
 src/libafs/MakefileProto.LINUX.in | 11 +++++------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index e38fbe2b5..92674be12 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -490,6 +490,9 @@ else
 	esac
 	case $AFS_SYSNAME in
 		*_linux* | *_umlinux*)
+			if test "x$enable_kernel_module" = "xyes"; then
+			 AFS_SYSKVERS=`echo $LINUX_VERSION | awk -F\. '{print $[]1 $[]2}'`
+			fi
 			if test "x${AFS_SYSKVERS}" = "x"; then
 			 AC_MSG_ERROR(Couldn't guess your Linux version. Please use the --with-afs-sysname option to configure an AFS sysname.)
 			fi
@@ -525,10 +528,6 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
 		esac
 
 		if test "x$enable_kernel_module" = "xyes"; then
-		 AFS_SYSKVERS=`echo $LINUX_VERSION | awk -F\. '{print $[]1 $[]2}'`
-		 if test "x${AFS_SYSKVERS}" = "x"; then
-		  AC_MSG_ERROR(Couldn't guess your Linux version [2])
-		 fi
 		 if test "x$enable_debug_kernel" = "xno"; then
 			LINUX_GCC_KOPTS="$LINUX_GCC_KOPTS -fomit-frame-pointer"
 		 fi
diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in
index 7166d1634..ec8125d66 100644
--- a/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@@ -111,9 +111,9 @@ DESTDIRS=linux_destdirs
 
 include Makefile.common
 
-<linux26>
+<linux26 umlinux26>
 LINUX_MODULE_EXT=ko
-<all -linux26>
+<all -linux26 -umlinux26>
 LINUX_MODULE_EXT=o
 <all>
 
@@ -245,11 +245,10 @@ ${LIBAFS} ${LIBAFS_MP} ${LIBAFS_EP} ${LIBAFS_BM}: libafs.ko
 
 .FORCE:
 libafs.ko: .FORCE
-	export EXTRA_CFLAGS=${EXKERNFLAGS}
-	$(shell export EXTRA_CFLAGS="${EXKERNFLAGS}" && ../$(srcdir)/make_kbuild_makefile.pl ${KDIR} $@ @TOP_OBJDIR@/src/config/Makefile.config Makefile.afs Makefile.common)
-	$(MAKE) -C ${LINUX_KERNEL_PATH} M=@TOP_OBJDIR@/src/libafs/${KDIR} modules
+	env EXTRA_CFLAGS="${EXTRA_CFLAGS}" ../$(srcdir)/make_kbuild_makefile.pl ${KDIR} $@ @TOP_OBJDIR@/src/config/Makefile.config Makefile.afs Makefile.common
+	env EXTRA_CFLAGS="${EXTRA_CFLAGS}" $(MAKE) -C ${LINUX_KERNEL/src/libafs/${KDIR} modules
         
-<all -linux26>
+<all -linux26 -umlinux26>
 ${LIBAFS}: $(AFSAOBJS) $(AFSNONFSOBJS)
 	$(RM) -f $@
 	$(LD) -r -o $@ $(AFSAOBJS) $(AFSNONFSOBJS)
-- 
2.39.5