From: Jeffrey Hutzelman <jhutz@cmu.edu>
Date: Thu, 15 May 2003 16:27:33 +0000 (+0000)
Subject: STABLE12-solaris-deal-with-gatekeeper-stupidity-20030515
X-Git-Tag: openafs-stable-1_2_10~78
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=bb87ee7e7f55c83bcfdf472a825bacb8458850dc;p=packages%2Fo%2Fopenafs.git

STABLE12-solaris-deal-with-gatekeeper-stupidity-20030515

FIXES 1261

make gmake not try to link libafs.o and libafs.nonfs.o into another object


(cherry picked from commit 68c67f8621f8d76f430b7329c1db8d6704ec0037)
---

diff --git a/src/libafs/MakefileProto.SOLARIS.in b/src/libafs/MakefileProto.SOLARIS.in
index 4d4657999..81ab369c9 100644
--- a/src/libafs/MakefileProto.SOLARIS.in
+++ b/src/libafs/MakefileProto.SOLARIS.in
@@ -143,16 +143,11 @@ DEST_LIBAFS = ${DEST}/root.client/usr/vice/etc/modload/${LIBAFS}
 DEST_LIBAFSNONFS = ${DEST}/root.client/usr/vice/etc/modload/${LIBAFSNONFS}
 
 <sun4x_57 sun4x_58 sun4x_59 sunx86_57 sunx86_58 sunx86_59>
+INST_LIBAFSNONFS = ${DESTDIR}${afskerneldir}/libafs${BITS}.nonfs.o
+INST_LIBAFS = ${DESTDIR}${afskerneldir}/libafs${BITS}.o
 
-libafs: ${LIBAFSNONFS} ${LIBAFS}
-
-install_libafs: ${LIBAFSNONFS} ${LIBAFS}
-	${INSTALL} -f ${LIBAFSNONFS} ${DESTDIR}${afskerneldir}/libafs${BITS}.nonfs.o
-	${INSTALL} -f ${LIBAFS} ${DESTDIR}${afskerneldir}/libafs${BITS}.o
-
-dest_libafs: ${LIBAFSNONFS} ${LIBAFS}
-	${INSTALL} -f ${LIBAFSNONFS} ${DEST}/root.client/usr/vice/etc/modload/libafs${BITS}.nonfs.o
-	${INSTALL} -f ${LIBAFS} ${DEST}/root.client/usr/vice/etc/modload/libafs${BITS}.o
+DEST_LIBAFSNONFS = ${DEST}/root.client/usr/vice/etc/modload/libafs${BITS}.nonfs.o
+DEST_LIBAFS = ${DEST}/root.client/usr/vice/etc/modload/libafs${BITS}.o
 
 <all>
 # Without this line, gmake tries to build libafs.o