From: Jim Rees <rees@umich.edu>
Date: Sat, 28 Jun 2003 20:39:03 +0000 (+0000)
Subject: freebsd-20030628
X-Git-Tag: openafs-devel-1_3_50~146
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b251040bb2086d9bc85f9c79ea53e83407c04492;p=packages%2Fo%2Fopenafs.git

freebsd-20030628


change freebsd kernel module name to libafs.ko (required by kldload)
---

diff --git a/src/libafs/MakefileProto.FBSD.in b/src/libafs/MakefileProto.FBSD.in
index ad048dcb9..3c032d1ca 100644
--- a/src/libafs/MakefileProto.FBSD.in
+++ b/src/libafs/MakefileProto.FBSD.in
@@ -67,8 +67,8 @@ setup:
 
 
 # Below this line are targets when in the COMMON directory:
-LIBAFS = libafs.o
-LIBAFSNONFS = libafs.nonfs.o
+LIBAFS = libafsnfs.ko
+LIBAFSNONFS = libafs.ko
 
 INST_LIBAFS = ${DESTDIR}${afskerneldir}/${LIBAFS}
 INST_LIBAFSNONFS = ${DESTDIR}${afskerneldir}/${LIBAFSNONFS}
@@ -116,15 +116,15 @@ ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS)
 
 ${LIBAFSNONFS}:  $(AFSAOBJS) $(AFSNONFSOBJS)
 <i386_fbsd_42 i386_fbsd_43 i386_fbsd_44 i386_fbsd_45 i386_fbsd_46 i386_fbsd_47>
-	$(LD) -r -o ${LIBAFSNONFS}.kld ${AFSAOBJS} ${AFSNONFSOBJS}
-	gensetdefs ${LIBAFSNONFS}.kld
+	$(LD) -r -o libafs.kld ${AFSAOBJS} ${AFSNONFSOBJS}
+	gensetdefs libafs.kld
 	$(MAKE) setdef0.o setdef1.o
-	$(LD) -Bshareable -o ${LIBAFSNONFS} setdef0.o ${LIBAFSNONFS}.kld setdef1.o
+	$(LD) -Bshareable -o ${LIBAFSNONFS} setdef0.o libafs.kld setdef1.o
 <all -i386_fbsd_42 -i386_fbsd_43 -i386_fbsd_44 -i386_fbsd_45 -i386_fbsd_46 -i386_fbsd_47>
-	$(LD) -r -d -warn-common -o ${LIBAFSNONFS}.kld ${AFSAOBJS} ${AFSNONFSOBJS}
+	$(LD) -r -d -warn-common -o libafs.kld ${AFSAOBJS} ${AFSNONFSOBJS}
 	touch export_syms
-	awk -f ${KSRC}/conf/kmod_syms.awk ${LIBAFSNONFS}.kld export_syms | xargs -J% objcopy % ${LIBAFSNONFS}.kld
-	$(LD) -Bshareable -d -warn-common -o ${LIBAFSNONFS}.ko ${LIBAFSNONFS}.kld
+	awk -f ${KSRC}/conf/kmod_syms.awk libafs.kld export_syms | xargs -J% objcopy % libafs.kld
+	$(LD) -Bshareable -d -warn-common -o ${LIBAFSNONFS} libafs.kld
 <all>