revert-pinstall-collateral-damage-20080630

LICENSE IPL10

we'll fix this another way (with install-sh)

diff --git a/src/libafs/MakefileProto.AIX.in b/src/libafs/MakefileProto.AIX.in
index 1f42eb8..a2046f5 100644 (file)
--- a/src/libafs/MakefileProto.AIX.in
+++ b/src/libafs/MakefileProto.AIX.in
@@ -116,21 +116,13 @@ ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}:
                        KASOPTS="64" ; \
                        TARG="afs.ext.64" ; \
                fi ; \
-               $(MAKE) DEST="$${DEST}" KOPTS="$${KOPTS}"  KLDOPTS="$${KLDOPTS}" KASOPTS="$${KASOPTS}" SUBDIR=$${KDIR} $@_$${TARG} || exit $$?; \
+               cd $${KDIR} ; \
+               $(MAKE) DEST="$${DEST}" KOPTS="$${KOPTS}"  KLDOPTS="$${KLDOPTS}" KASOPTS="$${KASOPTS}" $@_$${TARG} || exit $$?; \
+               cd ../ ; \
        done
 
-aix_compdirs_afs.ext.32: 
-       if true; then \
-       cd $${SUBDIR}; \
-       $(MAKE) afs.ext.32 || exit $$?; \
-       cd ..; \
-       fi
-aix_compdirs_afs.ext.64: 
-       if true; then \
-       cd $${SUBDIR}; \
-       $(MAKE) afs.ext.64 || exit $$?; \
-       cd ..; \
-       fi
+aix_compdirs_afs.ext.32: afs.ext.32
+aix_compdirs_afs.ext.64: afs.ext.64
 aix_instdirs_afs.ext.32: install_afs.ext.32
 aix_instdirs_afs.ext.64: install_afs.ext.64
 aix_destdirs_afs.ext.32: dest_afs.ext.32
@@ -138,30 +130,31 @@ aix_destdirs_afs.ext.64: dest_afs.ext.64
 
 dest_afs.ext.32: afs.ext.32
        ${INSTALL} -d $(DEST)/root.client/usr/vice/etc/dkload
-       $(INSTALL) -m 644 $(SUBDIR)/afs.ext.32 $(DEST)/root.client/usr/vice/etc/dkload/afs.ext.32
+       $(INSTALL) -m 644 afs.ext.32 $(DEST)/root.client/usr/vice/etc/dkload/afs.ext.32
        -${STRIP} -X 32 $(DEST)/root.client/usr/vice/etc/dkload/afs.ext.32
-       $(INSTALL) -m 644 $(SUBDIR)/afs.ext.32.map $(DEST)/root.client/usr/vice/etc/dkload/afs.ext.32.map
+       $(INSTALL) -m 644 afs.ext.32.map $(DEST)/root.client/usr/vice/etc/dkload/afs.ext.32.map
        echo Install for 32-bit Kernel Complete
 
 dest_afs.ext.64: afs.ext.64
        ${INSTALL} -d $(DEST)/root.client/usr/vice/etc/dkload
-       $(INSTALL) -m 644 $(SUBDIR)/afs.ext.64 $(DEST)/root.client/usr/vice/etc/dkload/afs.ext.64
+       $(INSTALL) -m 644 afs.ext.64 $(DEST)/root.client/usr/vice/etc/dkload/afs.ext.64
        -${STRIP} -X 64 $(DEST)/root.client/usr/vice/etc/dkload/afs.ext.32
-       $(INSTALL) -m 644 $(SUBDIR)/afs.ext.64.map $(DEST)/root.client/usr/vice/etc/dkload/afs.ext.64.map
+       $(INSTALL) -m 644 afs.ext.64.map $(DEST)/root.client/usr/vice/etc/dkload/afs.ext.64.map
        echo Install for 64-bit Kernel Complete
 
 install_afs.ext.32: afs.ext.32
        ${INSTALL} -d $(DESTDIR)$(afskerneldir)
-       $(INSTALL) -m 644 $(SUBDIR)/afs.ext.32 $(DESTDIR)$(afskerneldir)/afs.ext.32
+       $(INSTALL) -m 644 afs.ext.32 $(DESTDIR)$(afskerneldir)/afs.ext.32
        -${STRIP} -X 32 $(DESTDIR)$(afskerneldir)/afs.ext.32
-       $(INSTALL) -m 644 $(SUBDIR)/afs.ext.32.map $(DESTDIR)$(afskerneldir)/afs.ext.32.map
+       $(INSTALL) -m 644 afs.ext.32.map $(DESTDIR)$(afskerneldir)/afs.ext.32.map
        echo Install for 32-bit Kernel Complete
 
 install_afs.ext.64: afs.ext.64
-       ${INSTALL} -d $(DESTDIR)$(afskerneldir) 
-       $(INSTALL) -m 644 $(SUBDIR)/afs.ext.64 $(DESTDIR)$(afskerneldir)/afs.ext.64
+       ${INSTALL} -d $(DESTDIR)$(afskerneldir)
+       $(DESTDIR)$(afskerneldir)/afs.ext.64
+       $(INSTALL) -m 644 afs.ext.64 $(DESTDIR)$(afskerneldir)/afs.ext.64
        -${STRIP} -X 64 $(DESTDIR)$(afskerneldir)/afs.ext.64
-       $(INSTALL) -m 644 $(SUBDIR)/afs.ext.64.map $(DESTDIR)$(afskerneldir)/afs.ext.64.map
+       $(INSTALL) -m 644 afs.ext.64.map $(DESTDIR)$(afskerneldir)/afs.ext.64.map
        echo Install for 64-bit Kernel Complete
 
 # Standard AFS->NFS translator support is removed in AFS 3.5 in favor of
@@ -202,15 +195,15 @@ libafs: $(LIBAFS) $(LIBAFS64) $(LIBAFSIAUTH)
 
 install_libafs: $(INST_LIBAFSIAUTH)
        ${INSTALL} -d ${DESTDIR}${afskerneldir}
-       $(INSTALL) -m 644 $(SUBDIR)/$(LIBAFSIAUTH) $(INST_LIBAFSIAUTH)
+       $(INSTALL) -m 644 $(LIBAFSIAUTH) $(INST_LIBAFSIAUTH)
        -${STRIP} $(INST_LIBAFSIAUTH)
-       $(INSTALL) -m 644 $(SUBDIR)/$(LIBAFSIAUTH).map $(INST_LIBAFSIAUTH).map
+       $(INSTALL) -m 644 $(LIBAFSIAUTH).map $(INST_LIBAFSIAUTH).map
 
 dest_libafs: $(DEST_LIBAFSIAUTH)
        ${INSTALL} -d $(DEST)/root.client/usr/vice/etc/dkload
-       $(INSTALL) -m 644 $(SUBDIR)/$(LIBAFSIAUTH) $(DEST_LIBAFSIAUTH)
+       $(INSTALL) -m 644 $(LIBAFSIAUTH) $(DEST_LIBAFSIAUTH)
        -${STRIP} $(DEST_LIBAFSIAUTH)
-       $(INSTALL) -m 644 $(SUBDIR)/$(LIBAFSIAUTH).map $(DEST_LIBAFSIAUTH).map
+       $(INSTALL) -m 644 $(LIBAFSIAUTH).map $(DEST_LIBAFSIAUTH).map
 
 osi_assem.o:   osi_assem.s
        ${AS} -a${KASOPTS} -o osi_assem.o osi_assem.s

diff --git a/src/libafs/MakefileProto.HPUX.in b/src/libafs/MakefileProto.HPUX.in
index e023f0e..cc06c03 100644 (file)
--- a/src/libafs/MakefileProto.HPUX.in
+++ b/src/libafs/MakefileProto.HPUX.in
@@ -202,19 +202,14 @@ ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}:
                32)     bopts="$(KDEFS_32)"; bsuff="";; \
                64)     bopts="$(KDEFS_64)"; bsuff="64";; \
                esac; \
-               $(MAKE) BITSUFFIX=$$bsuff CPU_KDEFS="$$bopts" SUBDIR=$$dir $@_libafs || exit $$?; \
+               cd $$dir; \
+               $(MAKE) BITSUFFIX=$$bsuff CPU_KDEFS="$$bopts" $@_libafs || exit $$?; \
+               cd ..; \
            done; \
        done; \
        fi
 
-hpux_compdirs_libafs: 
-       if true; then \
-       cd $${SUBDIR}; \
-       $(MAKE) depsrcs; \
-       $(MAKE) libafs || exit $$?; \
-       cd ..; \
-       fi
-
+hpux_compdirs_libafs: depsrcs libafs
 hpux_instdirs_libafs: install_libafs
 hpux_destdirs_libafs: dest_libafs
 
@@ -239,11 +234,11 @@ libafs: ${LIBAFSNONFS}
 
 install_libafs: $(LIBAFSNONFS)
        ${INSTALL} -d ${DESTDIR}${afskerneldir}
-       ${INSTALL} -m 644 $(SUBDIR)/$(LIBAFSNONFS) $(INST_LIBAFSNONFS)
+       ${INSTALL} -m 644 $(LIBAFSNONFS) $(INST_LIBAFSNONFS)
 
 dest_libafs: $(LIBAFSNONFS)
        ${INSTALL} -d ${DEST}/root.client/usr/bin
-       ${INSTALL} -m 644 $(SUBDIR)/$(LIBAFSNONFS) $(DEST_LIBAFSNONFS)
+       ${INSTALL} -m 644 $(LIBAFSNONFS) $(DEST_LIBAFSNONFS)
 
 ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS)
 <all -ia64_hpux1123 -hp_ux1123>

diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in
index c8c9f11..72b88c0 100644 (file)
--- a/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@@ -229,23 +229,16 @@ ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}:
                        SMP_DEF="@RHCONFIG_SP@ ${LOCAL_SMP_DEF}" ; \
                        TARG=libafs ; \
                fi ; \
-               $(MAKE) SMP_DEF="$${SMP_DEF}" $@_$${TARG} CLIENT=${LINUX_VERSION}${LINUX_MODULE_NAME} KDIR=$${KDIR} || exit $$?; \
+               cd $${KDIR} ; \
+               $(MAKE) -f Makefile.afs SMP_DEF="$${SMP_DEF}" $@_$${TARG} CLIENT=${LINUX_VERSION}${LINUX_MODULE_NAME} KDIR=$${KDIR} || exit $$?; \
+               cd ../ ; \
 <all>
        done
 
-
-linux_compdirs_libafs:
-       cd ${KDIR} && $(MAKE) -f Makefile.afs SMP_DEF="$${SMP_DEF}" depsrcs CLIENT=${LINUX_VERSION}${LINUX_MODULE_NAME} KDIR=$${KDIR} && $(MAKE) -f Makefile.afs SMP_DEF="$${SMP_DEF}" libafs CLIENT=${LINUX_VERSION}${LINUX_MODULE_NAME} KDIR=$${KDIR} 
-
-linux_compdirs_libafs.mp: 
-       cd ${KDIR} && $(MAKE) -f Makefile.afs SMP_DEF="$${SMP_DEF}" depsrcs CLIENT=${LINUX_VERSION}${LINUX_MODULE_NAME} KDIR=$${KDIR} && $(MAKE) -f Makefile.afs SMP_DEF="$${SMP_DEF}" libafs.mp CLIENT=${LINUX_VERSION}${LINUX_MODULE_NAME} KDIR=$${KDIR} 
-
-linux_compdirs_libafs.ep: 
-       cd ${KDIR} && $(MAKE) -f Makefile.afs SMP_DEF="$${SMP_DEF}" depsrcs CLIENT=${LINUX_VERSION}${LINUX_MODULE_NAME} KDIR=$${KDIR} && $(MAKE) -f Makefile.afs SMP_DEF="$${SMP_DEF}" libafs.ep CLIENT=${LINUX_VERSION}${LINUX_MODULE_NAME} KDIR=$${KDIR} 
-
-linux_compdirs_libafs.bm: 
-       cd ${KDIR} && $(MAKE) -f Makefile.afs SMP_DEF="$${SMP_DEF}" depsrcs CLIENT=${LINUX_VERSION}${LINUX_MODULE_NAME} KDIR=$${KDIR} && $(MAKE) -f Makefile.afs SMP_DEF="$${SMP_DEF}" libafs.bm CLIENT=${LINUX_VERSION}${LINUX_MODULE_NAME} KDIR=$${KDIR} 
-
+linux_compdirs_libafs: depsrcs libafs
+linux_compdirs_libafs.mp: depsrcs libafs.mp
+linux_compdirs_libafs.ep: depsrcs libafs.ep
+linux_compdirs_libafs.bm: depsrcs libafs.bm
 linux_instdirs_libafs: install_libafs
 linux_instdirs_libafs.mp: install_libafs.mp
 linux_instdirs_libafs.ep: install_libafs.ep
@@ -315,40 +308,40 @@ ${LIBAFS_BM}: $(AFSAOBJS) $(AFSNONFSOBJS)
 
 install_libafs:        $(LIBAFS) 
        ${INSTALL} -d ${DESTDIR}${afskerneldir}
-       ${INSTALL} -m 644 $(KDIR)/$(LIBAFS) $(INST_LIBAFS)
+       ${INSTALL} -m 644 $(LIBAFS) $(INST_LIBAFS)
        echo SP Install Complete
 
 install_libafs.mp: $(LIBAFS_MP)
        ${INSTALL} -d ${DESTDIR}${afskerneldir}
-       ${INSTALL} -m 644 $(KDIR)/$(LIBAFS_MP) $(INST_LIBAFS_MP)
+       ${INSTALL} -m 644 $(LIBAFS_MP) $(INST_LIBAFS_MP)
        echo MP Install Complete
 
 install_libafs.ep: $(LIBAFS_EP)
        ${INSTALL} -d ${DESTDIR}${afskerneldir}
-       ${INSTALL} -m 644 $(KDIR)/$(LIBAFS_EP) $(INST_LIBAFS_EP)
+       ${INSTALL} -m 644 $(LIBAFS_EP) $(INST_LIBAFS_EP)
        echo EP Install Complete
 
 install_libafs.bm: $(LIBAFS_BM)
        ${INSTALL} -d ${DESTDIR}${afskerneldir}
-       ${INSTALL} -m 644 $(KDIR)/$(LIBAFS_BM) $(INST_LIBAFS_BM)
+       ${INSTALL} -m 644 $(LIBAFS_BM) $(INST_LIBAFS_BM)
        echo BM Install Complete
 
 dest_libafs:   $(LIBAFS) 
        ${INSTALL} -d ${DEST}/root.client/usr/vice/etc/modload
-       ${INSTALL} -m 644 $(KDIR)/$(LIBAFS) $(DEST_LIBAFS)
+       ${INSTALL} -m 644 $(LIBAFS) $(DEST_LIBAFS)
        echo SP Install Complete
 
 dest_libafs.mp: $(LIBAFS_MP)
        ${INSTALL} -d ${DEST}/root.client/usr/vice/etc/modload
-       ${INSTALL} -m 644 $(KDIR)/$(LIBAFS_MP) $(DEST_LIBAFS_MP)
+       ${INSTALL} -m 644 $(LIBAFS_MP) $(DEST_LIBAFS_MP)
        echo MP Install Complete
 
 dest_libafs.ep: $(LIBAFS_EP)
        ${INSTALL} -d ${DEST}/root.client/usr/vice/etc/modload
-       ${INSTALL} -m 644 $(KDIR)/$(LIBAFS_EP) $(DEST_LIBAFS_EP)
+       ${INSTALL} -m 644 $(LIBAFS_EP) $(DEST_LIBAFS_EP)
        echo EP Install Complete
 
 dest_libafs.bm: $(LIBAFS_BM)
        ${INSTALL} -d ${DEST}/root.client/usr/vice/etc/modload
-       ${INSTALL} -m 644 $(KDIR)/$(LIBAFS_BM) $(DEST_LIBAFS_BM)
+       ${INSTALL} -m 644 $(LIBAFS_BM) $(DEST_LIBAFS_BM)
        echo BM Install Complete

diff --git a/src/libafs/MakefileProto.SOLARIS.in b/src/libafs/MakefileProto.SOLARIS.in
index f38e0d9..cebb5e5 100644 (file)
--- a/src/libafs/MakefileProto.SOLARIS.in
+++ b/src/libafs/MakefileProto.SOLARIS.in
@@ -107,16 +107,12 @@ ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}:
                esac ; \
                export ARCH_DEFS ; \
                export BITS ; \
-               $(MAKE) SUBDIR=$$t $@_libafs ; \
+               cd $$t  ; \
+               $(MAKE) $@_libafs ; \
+               cd ../ ;\
        done
 
-solaris_compdirs_libafs: 
-       if true; then \
-       cd ${SUBDIR}; \
-       $(MAKE) depsrcs; \
-       $(MAKE) libafs || exit $$?; \
-       cd ..; \
-       fi
+solaris_compdirs_libafs: depsrcs libafs
 solaris_instdirs_libafs: install_libafs
 solaris_destdirs_libafs: dest_libafs
 
@@ -149,13 +145,13 @@ libafs:   $(LIBAFSNONFS) $(LIBAFS)
 
 install_libafs:        $(LIBAFS) $(LIBAFSNONFS)
        ${INSTALL} -d ${DESTDIR}${afskerneldir}
-       ${INSTALL} -m 644 $(SUBDIR)/$(LIBAFS) $(INST_LIBAFS)
-       ${INSTALL} -m 644 $(SUBDIR)/$(LIBAFSNONFS) $(INST_LIBAFSNONFS)
+       ${INSTALL} -m 644 $(LIBAFS) $(INST_LIBAFS)
+       ${INSTALL} -m 644 $(LIBAFSNONFS) $(INST_LIBAFSNONFS)
 
 dest_libafs: $(LIBAFS) $(LIBAFSNONFS)
        ${INSTALL} -d ${DEST}/root.client/usr/vice/etc/modload
-       ${INSTALL} -m 644 $(SUBDIR)/$(LIBAFS) $(DEST_LIBAFS)
-       ${INSTALL} -m 644 $(SUBDIR)/$(LIBAFSNONFS) $(DEST_LIBAFSNONFS)
+       ${INSTALL} -m 644 $(LIBAFS) $(DEST_LIBAFS)
+       ${INSTALL} -m 644 $(LIBAFSNONFS) $(DEST_LIBAFSNONFS)
 
 ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS)
        $(RM) -f $@