solaris-9-support-20011008

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

diff --git a/src/libafs/MakefileProto.SOLARIS.in b/src/libafs/MakefileProto.SOLARIS.in
index 40bf4c8..afc4dbb 100644 (file)
--- a/src/libafs/MakefileProto.SOLARIS.in
+++ b/src/libafs/MakefileProto.SOLARIS.in
@@ -7,9 +7,22 @@
 
 # MakefileProto for Solaris systems
 #
-DESTDIR=@DESTDIR@
-SRCDIR=@SRCDIR@
+DEST=@DEST@
+TOP_INCDIR=@TOP_INCDIR@
+TOP_LIBDIR=@TOP_LIBDIR@
 TOP_SRCDIR=@TOP_SRCDIR@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+sbindir=@sbindir@
+libexecdir=@libexecdir@
+libdir=@libdir@
+includedir=@includedir@
+mandir=@mandir@
+afssrvbindir=@afssrvbindir@
+afssrvsbindir=@afssrvsbindir@
+afssrvlibexecdir=@afssrvlibexecdir@
+afskerneldir=@afskerneldir@
 SYS_NAME=@AFS_SYSNAME@
 
 include config/Makefile.${SYS_NAME}
@@ -39,7 +52,7 @@ DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT
 KDEFS= -Dsun4c -DSUN4C_60 -DNFSCLIENT -DSYSACCT -DOLDSCSI -DVDDRV -D_KERNEL \
        -DSYSV -dn ${ARCH_DEFS}
 
-<sun4x_57 sun4x_58>
+<sun4x_57 sun4x_58 sun4x_59>
 KDEFS_32 = 
 KDEFS_64 = -xarch=v9
 
@@ -47,27 +60,29 @@ KDEFS_64 = -xarch=v9
 CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
 
 # Name of directory to hold object files and libraries.
-<all -sun4x_57 -sun4x_58>
+<all -sun4x_57 -sun4x_58 -sun4x_59>
 KOBJ = MODLOAD
-<sun4x_57 sun4x_58>
+<sun4x_57 sun4x_58 sun4x_59>
 KOBJ = MODLOAD32 MODLOAD64
 
 
 # This tells Makefile.common to use it's single directory build target.
-<all -sun4x_57 -sun4x_58>
+<all -sun4x_57 -sun4x_58 -sun4x_59>
 COMPDIRS = single_compdir
 INSTDIRS = single_instdir
+DESTDIRS = single_destdir
 
-<sun4x_57 sun4x_58>
+<sun4x_57 sun4x_58 sun4x_59>
 COMPDIRS = solaris_compdirs
 INSTDIRS = solaris_instdirs
+DESTDIRS = solaris_destdirs
 
 <all>
 include Makefile.common
 
 
 setup:
-       -rm -f  h net netinet rpc ufs nfs  machine sys inet
+       -$(RM) -f  h net netinet rpc ufs nfs  machine sys inet
        -ln -s /usr/include/sys h
        -ln -s /usr/include/net net
        -ln -s /usr/include/netinet netinet
@@ -79,7 +94,7 @@ setup:
        for t in ${KOBJ} ; do \
                echo Making directory: $$t; \
                mkdir -p $$t; \
-               rm -f $$t/Makefile.common $$t/Makefile $$t/config ; \
+               $(RM) -f $$t/Makefile.common $$t/Makefile $$t/config ; \
                ln -s ../Makefile.common $$t/Makefile.common ; \
                ln -s ../Makefile $$t/Makefile ;\
                ln -s ../config $$t/config ;\
@@ -89,8 +104,8 @@ setup:
 ## This is the target for a Solaris 7. Here we build both the 32 bit and
 ## the 64 bit libafs in MODLOAD32 and MODLOAD64 directories respectively
 
-<sun4x_57 sun4x_58>
-${COMPDIRS} ${INSTDIRS}:
+<sun4x_57 sun4x_58 sun4x_59>
+${COMPDIRS} ${INSTDIRS} ${DESTDIRS}:
        for t in ${KOBJ} ; do \
                echo Building directory: $$t ; \
                case $$t in \
@@ -110,6 +125,7 @@ ${COMPDIRS} ${INSTDIRS}:
 
 solaris_compdirs_libafs: libafs
 solaris_instdirs_libafs: install_libafs
+solaris_destdirs_libafs: dest_libafs
 
 <all>
 
@@ -117,17 +133,26 @@ solaris_instdirs_libafs: install_libafs
 LIBAFS = libafs.o
 LIBAFSNONFS = libafs.nonfs.o
 
-<all -sun4x_57 -sun4x_58>
-DEST_LIBAFS = ${DESTDIR}/root.client/usr/vice/etc/modload/${LIBAFS}
-DEST_LIBAFSNONFS = ${DESTDIR}/root.client/usr/vice/etc/modload/${LIBAFSNONFS}
+<all -sun4x_57 -sun4x_58 -sun4x_59>
+INST_LIBAFS = ${DESTDIR}${afskerneldir}/${LIBAFS}
+INST_LIBAFSNONFS = ${DESTDIR}${afskerneldir}/${LIBAFSNONFS}
+
+DEST_LIBAFS = ${DEST}/root.client/usr/vice/etc/modload/${LIBAFS}
+DEST_LIBAFSNONFS = ${DEST}/root.client/usr/vice/etc/modload/${LIBAFSNONFS}
 
 # Without this line, gmake tries to build libafs.o
 .PHONY: libafs
 
-# libafs:      $(DEST_LIBAFS) $(DEST_LIBAFSNONFS)
 libafs:        $(LIBAFSNONFS)
-install_libafs:        $(DEST_LIBAFSNONFS)
+install_libafs:        $(INST_LIBAFSNONFS)
+dest_libafs:   $(DEST_LIBAFSNONFS)
+
 
+$(INST_LIBAFS): $(LIBAFS)
+       ${INSTALL} -f $? $@
+
+$(INST_LIBAFSNONFS): $(LIBAFSNONFS)
+       ${INSTALL} -f $? $@
 
 $(DEST_LIBAFS): $(LIBAFS)
        ${INSTALL} -f $? $@
@@ -144,31 +169,34 @@ ${LIBAFSNONFS}:  $(AFSAOBJS) $(AFSNONFSOBJS)
        $(RM) -f $@
        $(LD) -r -o $@  $(AFSAOBJS) ${AFSNONFSOBJS}
 
-<sun4x_57 sun4x_58>
-MODLOADDIR = ${DESTDIR}root.client/usr/vice/etc/modload
+<sun4x_57 sun4x_58 sun4x_59>
 
 libafs: ${LIBAFSNONFS}
+
 install_libafs: ${LIBAFSNONFS}
-       ${INSTALL} -f ${LIBAFSNONFS} ${MODLOADDIR}/libafs${BITS}.nonfs.o
+       ${INSTALL} -f ${LIBAFSNONFS} ${DESTDIR}${afskerneldir}/libafs${BITS}.nonfs.o
+
+dest_libafs: ${LIBAFSNONFS}
+       ${INSTALL} -f ${LIBAFSNONFS} ${DEST}/root.client/usr/vice/etc/modload/libafs${BITS}.nonfs.o
 
 <all>
 
 # Solaris specific objects
 osi_groups.o: $(AFS)/osi_groups.c
-       $(CRULE1);
+       $(CRULE1)
 osi_inode.o: $(AFS)/osi_inode.c
-       $(CRULE1);
+       $(CRULE1)
 osi_file.o: $(AFS)/osi_file.c
-       $(CRULE1);
+       $(CRULE1)
 osi_sleep.o: $(AFS)/osi_sleep.c
-       $(CRULE1);
+       $(CRULE1)
 osi_vfsops_nfs.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -o osi_vfsops_nfs.o;
+       $(CRULE1) -o osi_vfsops_nfs.o
 osi_vfsops.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -DAFS_NONFSTRANS;
+       $(CRULE1) -DAFS_NONFSTRANS
 osi_vm.o: $(AFS)/osi_vm.c
-       $(CRULE1);
+       $(CRULE1)
 osi_vnodeops.o: $(AFS)/osi_vnodeops.c
-       $(CRULE1);
+       $(CRULE1)
 xdr_int64.o: $(RX)/xdr_int64.c
-       $(CRULE1);
+       $(CRULE1)