fbsd-70-updates-20080115

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

diff --git a/src/libafs/MakefileProto.FBSD.in b/src/libafs/MakefileProto.FBSD.in
index 4805a9d..bf0310a 100644 (file)
--- a/src/libafs/MakefileProto.FBSD.in
+++ b/src/libafs/MakefileProto.FBSD.in
@@ -7,6 +7,10 @@
 #
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 
 # OS specific object files:
@@ -30,16 +34,20 @@ AFS_OS_NONFSOBJS = \
 # System specific build commands and flags
 KSRC = @BSD_KERNEL_PATH@
 KBLD = @BSD_KERNEL_BUILD@
-KDEFS=-Wall -ansi -nostdinc -I/usr/include -D_KERNEL -DKLD_MODULE \
+KDEFS=-Wall -nostdinc -I/usr/include -D_KERNEL -DKLD_MODULE \
        -elf -mpreferred-stack-boundary=2 \
 <i386_fbsd_42 i386_fbsd_43 i386_fbsd_44 i386_fbsd_45 i386_fbsd_46 i386_fbsd_47>
        -fformat-extensions \
-       -include ${KBLD}/opt_global.h
+<i386_fbsd_42 i386_fbsd_43 i386_fbsd_44 i386_fbsd_45 i386_fbsd_46 i386_fbsd_47>
+       -include ${KBLD}/opt_global.h \
+<i386_fbsd_60>
+       -mno-mmx -mno-3dnow -mno-sse -mno-sse2 \
 <all -i386_fbsd_42 -i386_fbsd_43 -i386_fbsd_44 -i386_fbsd_45 -i386_fbsd_46 -i386_fbsd_47>
-       -mno-align-long-strings -fformat-extensions -fno-common -ffreestanding \
-       -I${KBLD} -include opt_global.h -fno-strict-aliasing
+       -mno-align-long-strings -fno-common -ffreestanding \
+       -I${KBLD} -include opt_global.h -fno-strict-aliasing \
 <all>
 
+
 DBUG = -O2
 #DBUG = -O -g
 DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT
@@ -65,7 +73,7 @@ setup:
        ln -fs ../Makefile.common $(KOBJ)/Makefile.common
        -$(RM) -f  h net netinet rpc ufs nfs  machine sys vm
        -ln -fs ${KSRC}/net net
-       -ln -fs ${KSRC}/i386/include machine
+       -ln -fs ${KSRC}/@HOST_CPU@/include machine
        -ln -fs ${KSRC}/netinet netinet
        -ln -fs ${KSRC}/nfs nfs
        -ln -fs /usr/include/rpc rpc
@@ -94,31 +102,14 @@ DEST_LIBAFSNONFS = ${DEST}/root.client/bin/${LIBAFSNONFS}
 
 # libafs:      $(LIBAFS) $(LIBAFSNONFS)
 libafs:        $(LIBAFSNONFS)
-# install_libafs:      $(INST_LIBAFS) $(INST_LIBAFSNONFS)
-install_libafs:        $(INST_LIBAFSNONFS)
-# dest_libafs: $(DEST_LIBAFS) $(DEST_LIBAFSNONFS)
-dest_libafs:   $(DEST_LIBAFSNONFS)
-#libafs:
-#      echo WARNING: No kernel module for ${SYS_NAME}
-
-#install_libafs:
-#      echo WARNING: No kernel module for ${SYS_NAME}
-
-#dest_libafs:
-#      echo WARNING: No kernel module for ${SYS_NAME}
-
-
-$(INST_LIBAFS): $(LIBAFS)
-       $(INSTALL) -f $? $@
-
-$(INST_LIBAFSNONFS): $(LIBAFSNONFS)
-       $(INSTALL) -f $? $@
 
-$(DEST_LIBAFS): $(LIBAFS)
-       $(INSTALL) -f $? $@
+install_libafs:        $(LIBAFSNONFS)
+       ${INSTALL} -d ${DESTDIR}${afskerneldir}
+       ${INSTALL} -m 644 $(LIBAFSNONFS) $(INST_LIBAFSNONFS)
 
-$(DEST_LIBAFSNONFS): $(LIBAFSNONFS)
-       $(INSTALL) -f $? $@
+dest_libafs: $(LIBAFSNONFS)
+       ${INSTALL} -d ${DEST}/root.client/bin
+       ${INSTALL} -m 644 $(LIBAFSNONFS) $(DEST_LIBAFSNONFS)
 
 ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS)
        $(LD) -r -o ${LIBAFS}.kld ${AFSAOBJS} ${AFSNFSOBJS}