From: Russ Allbery <rra@debian.org>
Date: Thu, 12 Feb 2009 18:38:01 +0000 (-0800)
Subject: Merge branch 'upstream' into bug/module-name
X-Git-Tag: debian/1.4.8.dfsg1-1~34^2
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=a97d2f4ac86de7a5b5b9fc5aa4dee80e55434a8f;p=packages%2Fo%2Fopenafs.git

Merge branch 'upstream' into bug/module-name
---

a97d2f4ac86de7a5b5b9fc5aa4dee80e55434a8f
diff --cc src/libafs/MakefileProto.LINUX.in
index 50a731212,e201bf9aa..08fef8b04
--- a/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@@@ -249,13 -252,13 +250,13 @@@ libafs.bm: $(LIBAFS_BM
  	echo BM Build Complete
  
  <linux26 linux_26 umlinux26>
 -${LIBAFS} ${LIBAFS_MP} ${LIBAFS_EP} ${LIBAFS_BM}: libafs.ko
 -	cp libafs.ko $@
 +${LIBAFS} ${LIBAFS_MP} ${LIBAFS_EP} ${LIBAFS_BM}: openafs.ko
 +	cp openafs.ko $@
  
  .FORCE:
 -libafs.ko: .FORCE
 +openafs.ko: .FORCE
  	env EXTRA_CFLAGS="${EXTRA_CFLAGS}" @TOP_SRCDIR@/libafs/make_kbuild_makefile.pl ${KDIR} $@ @TOP_OBJDIR@/src/config/Makefile.config Makefile.afs Makefile.common
- 	env EXTRA_CFLAGS="${EXTRA_CFLAGS}" $(MAKE) -C ${LINUX_KERNEL_PATH} M=@TOP_OBJDIR@/src/libafs/${KDIR} modules
+ 	env EXTRA_CFLAGS="${EXTRA_CFLAGS}" $(MAKE) -C ${LINUX_KERNEL_BUILD} M=@TOP_OBJDIR@/src/libafs/${KDIR} modules
          
  <all -linux26 -linux_26 -umlinux26>
  ${LIBAFS}: $(AFSAOBJS) $(AFSNONFSOBJS)