STABLE14-aix-make-install-20050815

FIXES 20827

make install was broken on aix. fix it.

(cherry picked from commit 45d144da14c39ed48ae8be4f89d78cfc12985056)

diff --git a/src/export/Makefile.in b/src/export/Makefile.in
index c9ac0cbf276de452569cbf56fab10462e1712672..4b5e79860b3b643caeccbba5d8dadbde899c7bee 100644 (file)
--- a/src/export/Makefile.in
+++ b/src/export/Makefile.in
@@ -127,6 +127,18 @@ ${DEST}/root.client/usr/vice/etc/dkload/export.ext.nonfs: export.ext.nonfs
 ${DEST}/root.client/usr/vice/etc/dkload/export64.ext.nonfs: @AIX64@export64.ext.nonfs
 @AIX64@        ${INSTALL} $? $@
 
+${DESTDIR}${afskerneldir}/export.ext: export.ext
+       ${INSTALL} $? $@
+
+${DESTDIR}${afskerneldir}/export64.ext: @AIX64@export64.ext
+@AIX64@        ${INSTALL} $? $@
+
+${DESTDIR}${afskerneldir}/export.ext.nonfs: export.ext.nonfs
+       ${INSTALL} $? $@
+
+${DESTDIR}${afskerneldir}/export64.ext.nonfs: @AIX64@export64.ext.nonfs
+@AIX64@        ${INSTALL} $? $@
+
 ${DEST}/lib/afs/export.exp: export.exp
        ${INSTALL} $? $@
 
@@ -168,6 +180,18 @@ ${DEST}/root.client/usr/vice/etc/dkload/cfgafs: cfgafs
 ${DEST}/root.client/usr/vice/etc/dkload/cfgafs64: @AIX64@cfgafs64
 @AIX64@        ${INSTALL} $? $@
 
+${DESTDIR}${afskerneldir}/cfgexport: cfgexport
+       ${INSTALL} $? $@
+
+${DESTDIR}${afskerneldir}/cfgexport64: @AIX64@cfgexport64
+@AIX64@        ${INSTALL} $? $@
+
+${DESTDIR}${afskerneldir}/cfgafs: cfgafs
+       ${INSTALL} $? $@
+
+${DESTDIR}${afskerneldir}/cfgafs64: @AIX64@cfgafs64
+@AIX64@        ${INSTALL} $? $@
+
 dest:    ${DEST}/root.client/usr/vice/etc/dkload/export.ext \
        ${DEST}/root.client/usr/vice/etc/dkload/export.ext.nonfs \
        ${DEST}/root.client/usr/vice/etc/dkload/export64.ext.nonfs \

diff --git a/src/libafs/MakefileProto.AIX.in b/src/libafs/MakefileProto.AIX.in
index c135afe433d10604143d99f8e3c49daa5b4f483e..36c6ceb2cf595b5d413a852a18043e7885be85e5 100644 (file)
--- a/src/libafs/MakefileProto.AIX.in
+++ b/src/libafs/MakefileProto.AIX.in
@@ -126,6 +126,12 @@ dest_afs.ext.32: $(DEST)/root.client/usr/vice/etc/dkload/afs.ext.32
 dest_afs.ext.64: $(DEST)/root.client/usr/vice/etc/dkload/afs.ext.64
        echo Install for 64-bit Kernel Complete
 
+install_afs.ext.32: $(DESTDIR)$(afskerneldir)/afs.ext.32
+       echo Install for 32-bit Kernel Complete
+
+install_afs.ext.64: $(DESTDIR)$(afskerneldir)/afs.ext.64
+       echo Install for 64-bit Kernel Complete
+
 # Standard AFS->NFS translator support is removed in AFS 3.5 in favor of
 # the iauth authentication mechanism. The model was changed by IBM in the
 # middle of an OS release. So iauth is only supported on AIX 4.1.5 and 
@@ -133,13 +139,10 @@ dest_afs.ext.64: $(DEST)/root.client/usr/vice/etc/dkload/afs.ext.64
 # they are ever made. AIX 4.3 also uses the iauth translator.
 
 LIBAFSIAUTH = afs.ext.32.iauth
-LIBAFS = afs.ext.32
 
 DEST_LIBAFSIAUTH = $(DEST)/root.client/usr/vice/etc/dkload/$(LIBAFSIAUTH)
-DEST_LIBAFS = $(DEST)/root.client/usr/vice/etc/dkload/$(LIBAFS)
 
 INST_LIBAFSIAUTH = ${DESTDIR}${afskerneldir}/$(LIBAFSIAUTH)
-INST_LIBAFS = ${DESTDIR}${afskerneldir}/$(LIBAFS)
 
 $(DEST)/root.client/usr/vice/etc/dkload/afs.ext.32: afs.ext.32
        $(INSTALL) -f $? $@
@@ -151,12 +154,17 @@ $(DEST)/root.client/usr/vice/etc/dkload/afs.ext.64: afs.ext.64
        -${STRIP} -X 64 $@
        $(INSTALL) -f $?.map $@.map
        
-$(DEST_LIBAFSIAUTH): $(LIBAFSIAUTH)
+$(DESTDIR)$(afskerneldir)/afs.ext.32: afs.ext.32
        $(INSTALL) -f $? $@
-       -${STRIP} $@
+       -${STRIP} -X 32 $@
        $(INSTALL) -f $?.map $@.map
-       
-$(INST_LIBAFS): $(LIBAFS)
+
+$(DESTDIR)$(afskerneldir)/afs.ext.64: afs.ext.64
+       $(INSTALL) -f $? $@
+       -${STRIP} -X 64 $@
+       $(INSTALL) -f $?.map $@.map
+
+$(DEST_LIBAFSIAUTH): $(LIBAFSIAUTH)
        $(INSTALL) -f $? $@
        -${STRIP} $@
        $(INSTALL) -f $?.map $@.map