Do not include

version name in openafs kernel module

diff --git a/src/config/Makefile.i386_linux22 b/src/config/Makefile.i386_linux22
index 0128d4d261f02556f70adb1d4d53afdf61819430..33394ca4ce703597a34637e6227952fd0bd848a4 100644 (file)
--- 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 09d3b1a7a09f9241c7f97c1bc33cd66328f0a6da..66ce3ad070902e12ed4552c3b5ca9ba727201228 100644 (file)
--- 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 44b09e60cdd76eb42b071131b638b6ec72248eb7..536210fb784947479dd9ef279eead033144fff35 100644 (file)
--- 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}