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

Merge commit 'upstream/1.4.8.dfsg1'

Conflicts:

	src/afs/LINUX/osi_module.c
	src/cf/linux-test4.m4
	src/cf/osconf.m4
	src/config/param.alpha_linux_26.h
	src/ptserver/pt_util.c
---

fcf8c89d9b4c6928b52fffc3754f954288b0283f
diff --cc src/cf/osconf.m4
index f66ed066b,f4b25a79f..88841e879
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@@ -4,9 -4,10 +4,9 @@@ AC_DEFUN([OPENAFS_OSCONF], 
  dnl defaults, override in case below as needed
  XCFLAGS='${DBG} ${OPTMZ}'
  SHLIB_SUFFIX="so"
 -CC="cc"
 -CCOBJ="cc"
 -MT_CC="cc"
 +CCOBJ=$CC
 +MT_CC=$CC
- XLIBS="${LIB_AFSDB}"
+ XLIBS="${LIB_AFSDB} ${XBSA_XLIBS}"
  
  dnl debugging and optimization flag defaults
  dnl Note, these are all the defaults for if debug/optimize turned on, and
diff --cc src/libafs/MakefileProto.LINUX.in
index b4c1e50e7,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)