From 1b5159bc3ef9832e49b17a43a70156c7d8c43b81 Mon Sep 17 00:00:00 2001
From: Sam Hartman <hartmans@debian.org>
Date: Mon, 6 Nov 2000 13:23:38 +0000
Subject: [PATCH] Do not include version name in openafs kernel module

---
 src/config/Makefile.i386_linux22 |  4 ++--
 src/config/linux-version         |  2 +-
 src/libafs/MakefileProto.LINUX   | 18 +++++++++---------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/config/Makefile.i386_linux22 b/src/config/Makefile.i386_linux22
index 0128d4d26..33394ca4c 100644
--- a/src/config/Makefile.i386_linux22
+++ b/src/config/Makefile.i386_linux22
@@ -12,10 +12,10 @@ AFS_OSTYPE = LINUX
 
 # Base directory for linux kernel source. Actually a prefix which is complete
 # when LINUX_VERS is appended to it.
-LINUX_SRCDIR = /usr/src/linux-
+LINUX_SRCDIR = $(KSRC)
 # Default list of Linux kernels to build. Build will run only if all
 # can be built. To build a different set, specify LINUX_VERS to make.
-LINUX_VERS = 2.2.17
+LINUX_VERS = $(KVERS)
 
 #
 # compilation and link editor flags
diff --git a/src/config/linux-version b/src/config/linux-version
index 09d3b1a7a..66ce3ad07 100644
--- a/src/config/linux-version
+++ b/src/config/linux-version
@@ -38,7 +38,7 @@ found_one="false"
 CAN_BUILD=""
 
 for VERS in $LINUX_VERS ; do
-	dir=$LINUX_SRCDIR$VERS
+	dir=$LINUX_SRCDIR
 	if [ ! -d $dir ] ; then
 		echo "ERROR: Cannot build for Linux kernel $VERS: $dir does not exist."
 		errors=true
diff --git a/src/libafs/MakefileProto.LINUX b/src/libafs/MakefileProto.LINUX
index 44b09e60c..536210fb7 100644
--- a/src/libafs/MakefileProto.LINUX
+++ b/src/libafs/MakefileProto.LINUX
@@ -57,9 +57,9 @@ include Makefile.common
 setup:
 	-rm -f h net netinet sys rpc
 	-ln -s rx rpc
-	for v in ${LINUX_VERS} ; do \
+	for v in notused; do \
 		for m in ${MPS} ; do \
-			KDIR=$(KOBJ)-$$v-$$m; \
+			KDIR=$(KOBJ)-$$m; \
 			mkdir -p $${KDIR}; \
 			ln -fs ../Makefile $${KDIR}/Makefile ; \
 			ln -fs ../Makefile.common $${KDIR}/Makefile.common; \
@@ -71,8 +71,8 @@ setup:
 LINUX_INCDIR=include/linux
 
 ${COMPDIRS}:
-	for v in ${LINUX_VERS} ; do \
-		IDIR=${LINUX_SRCDIR}$$v/${LINUX_INCDIR}; \
+	for v in notused ; do \
+		IDIR=${LINUX_SRCDIR}/${LINUX_INCDIR}; \
 		rm -f h; \
 		ln -s $${IDIR} h; \
 		rm -f linux; \
@@ -84,9 +84,9 @@ ${COMPDIRS}:
 		rm -f sys; \
 		ln -s $${IDIR} sys; \
 		rm -f asm; \
-		ln -s ${LINUX_SRCDIR}$$v/include/asm-i386 asm ; \
+		ln -s ${LINUX_SRCDIR}/include/asm-i386 asm ; \
 		for m in ${MPS} ; do \
-			KDIR=${KOBJ}-$$v-$$m ; \
+			KDIR=${KOBJ}-$$m ; \
 			echo Building in directory: $${KDIR} ; \
 			if [ "$$m" = "MP" ] ; then \
 				SMP_DEF="-DAFS_SMP" ; \
@@ -96,7 +96,7 @@ ${COMPDIRS}:
 				TARG=libafs ; \
 			fi ; \
 			cd $${KDIR} ; \
-			$(MAKE) DESTDIR=${DESTDIR} SMP_DEF=$${SMP_DEF} $${TARG} CLIENT=$$v || exit $$?; \
+			$(MAKE) DESTDIR=${DESTDIR} SMP_DEF=$${SMP_DEF} $${TARG} CLIENT="" || exit $$?; \
 			cd ../ ; \
 		done \
 	done
@@ -104,8 +104,8 @@ ${COMPDIRS}:
 
 # Below this line are targets when in the COMMON directory:
 # For Linux there is no kernel NFS server.
-LIBAFS = libafs-${CLIENT}.o
-LIBAFS_MP = libafs-${CLIENT}.mp.o
+LIBAFS = libafs${CLIENT}.o
+LIBAFS_MP = libafs${CLIENT}.mp.o
 
 DEST_LIBAFS = ${DESTDIR}/root.client/usr/vice/etc/modload/${LIBAFS}
 DEST_LIBAFS_MP = ${DESTDIR}/root.client/usr/vice/etc/modload/${LIBAFS_MP}
-- 
2.39.5