FBSD: Set KERNBUILDDIR for --with-bsd-kernel-build

[openafs.git] / src / libafs / MakefileProto.FBSD.in

diff --git a/src/libafs/MakefileProto.FBSD.in b/src/libafs/MakefileProto.FBSD.in
index 9ba0954..26e86ea 100644 (file)
--- a/src/libafs/MakefileProto.FBSD.in
+++ b/src/libafs/MakefileProto.FBSD.in
@@ -8,11 +8,6 @@
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 
-# rx_event is miscompiled by gcc at -O0, causing panic on startup
-.if empty(${CFLAGS:M-O})
-CFLAGS+=       -O
-.endif
-
 # tell bsd.kmod.mk to build us vnode_if*
 SRCS=  vnode_if.h
 
@@ -46,6 +41,12 @@ AFS_OS_NONFSOBJS = \
 KSRC = @BSD_KERNEL_PATH@
 KBLD = @BSD_KERNEL_BUILD@
 
+# keep symbols if --enable-debug-kernel
+AC_DEBUG_FLAGS = @DEBUG_FLAGS@
+.if !empty(AC_DEBUG_FLAGS)
+DEBUG_FLAGS=   ${AC_DEBUG_FLAGS}
+.endif
+
 # We are not doing very well (WARNS=2 brings in printf format type checking)
 WARNS= 1
 # We have some sketchy code that redeclares prototypes
@@ -56,6 +57,9 @@ CWARNFLAGS+= -Wno-redundant-decls
 KMODDIR=/boot/modules
 KMOD=  libafs
 SYSDIR= ${KSRC}
+.if !empty(KBLD)
+KERNBUILDDIR=${KBLD}
+.endif
 
 # Name of directory to hold object files and libraries.
 KOBJ = MODLOAD
@@ -88,7 +92,7 @@ OBJS= ${AFSAOBJS} ${AFSNONFSOBJS}
 
 LIBAFSNONFS=   libafs.ko
 DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT
-CFLAGS+= $(DEFINES) ${COMMON_INCLUDE} -I@/sys -Imachine
+CFLAGS+= $(DEFINES) ${COMMON_INCLUDE}
 
 INST_LIBAFS = ${DESTDIR}${afskerneldir}/${LIBAFS}
 INST_LIBAFSNONFS = ${DESTDIR}${afskerneldir}/${LIBAFSNONFS}
@@ -96,7 +100,10 @@ INST_LIBAFSNONFS = ${DESTDIR}${afskerneldir}/${LIBAFSNONFS}
 DEST_LIBAFS = ${DEST}/root.client/bin/${LIBAFS}
 DEST_LIBAFSNONFS = ${DEST}/root.client/bin/${LIBAFSNONFS}
 
-install_libafs:        $(LIBAFSNONFS) install
+$(DESTDIR)$(KMODDIR)/:
+       $(INSTALL) -d $@
+
+install_libafs:        $(LIBAFSNONFS) $(DESTDIR)$(KMODDIR)/ install
 
 dest_libafs: $(LIBAFSNONFS)
        ${INSTALL} -d ${DEST}/root.client/bin