From e44d698cfea4f43306d5b0cd2097f67dd6beb2e2 Mon Sep 17 00:00:00 2001
From: Chaskiel M Grundman <cg2v@andrew.cmu.edu>
Date: Mon, 28 Apr 2008 04:45:27 +0000
Subject: [PATCH] STABLE14-kdump-install-fixups-20080427

LICENSE IPL10
FIXES 96465

The install rule:
- installs the empty 'kdump-build' file instead of the binary on all
platforms except irix
- overwrites the selection script with the binary on linux and hpux
- doesn't have an alpha_linux branch
- installs the wrapper script as kdump32 and the binary as kdump on
solaris (instead of vice-versa)

The dest rule:
- overwrites the selection script with the binary on alpha_linux and hpux


(cherry picked from commit 7a6751c08800da5d49bf3def9175174499f6337e)
---
 src/venus/Makefile.in | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in
index c07689a0ff..8b5412e5eb 100644
--- a/src/venus/Makefile.in
+++ b/src/venus/Makefile.in
@@ -283,13 +283,13 @@ ${DEST}/etc/kdump: kdump-build
 		${INSTALL} -f ${srcdir}/kdump ${DEST}/etc/kdump32;; \
 	*alpha_linux* ) \
 		${INSTALLex} -f ${srcdir}/kdump.sh.linux ${DEST}/etc/kdump; \
-		${INSTALL} kdump-alpha_linux-${LINUX_VERSION} $@ ;; \
+		${INSTALL} kdump-alpha_linux-${LINUX_VERSION} $@-${LINUX_VERSION} ;; \
 	*linux* ) \
 		${INSTALLex} -f ${srcdir}/kdump.sh.linux ${DEST}/etc/kdump; \
 		${INSTALL} kdump-linux-${LINUX_VERSION} $@-${LINUX_VERSION} ;; \
 	hp_ux11* ) \
 		${INSTALLex} -f ${srcdir}/kdump.sh.hp_ux11 ${DEST}/etc/kdump; \
-		${INSTALL} -f $? $@;; \
+		${INSTALL} -f $? ${DEST}/etc/kdump32;; \
 	*bsd*) \
 		;; \
 	*) \
@@ -357,16 +357,19 @@ ${DESTDIR}${sbindir}/kdump: kdump-build
 			do ${INSTALL} $$f ${DESTDIR}${sbindir}/$$f || exit $$? ; \
 		done ;; \
 	sun*_5[789] | sun*_510 ) \
-		${INSTALLex} -f kdump.sh.solaris7 ${DESTDIR}${sbindir}/kdump32; \
-		${INSTALL} -f $? $@;; \
+		${INSTALLex} -f kdump.sh.solaris7 ${DESTDIR}${sbindir}/kdump; \
+		${INSTALL} -f kdump ${DESTDIR}${sbindir}/kdump32;; \
+	*alpha_linux* ) \
+		${INSTALLex} -f kdump.sh.linux ${DESTDIR}${sbindir}/kdump; \
+		${INSTALL} kdump-alpha_linux-${LINUX_VERSION} $@-${LINUX_VERSION} ;; \
 	*linux* ) \
 		${INSTALLex} -f kdump.sh.linux ${DESTDIR}${sbindir}/kdump; \
-		${INSTALL} $? $@ ;; \
+		${INSTALL} kdump-linux-${LINUX_VERSION} $@-${LINUX_VERSION} ;; \
 	hp_ux11* ) \
 		${INSTALLex} -f kdump.sh.hp_ux11 ${DESTDIR}${sbindir}/kdump; \
-		${INSTALL} -f $? $@;; \
+		${INSTALL} -f kdump ${DESTDIR}${sbindir}/kdump32;; \
 	*) \
-		${INSTALL} $? $@ ;; \
+		${INSTALL} kdump $@ ;; \
 	esac
 
 ${DESTDIR}${sbindir}/kdump64: kdump-build