solaris-kdump-build-rationalization-20031204

make kdump64 and kdump32 get built with sanity on solaris

diff --git a/acinclude.m4 b/acinclude.m4
index ef6346f113d741f61d7c7cb8daa664167d160005..ed2002cf4da764b21c65c0ab4ba71f09ac5e50a7 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -597,7 +597,7 @@ KDUMP=kdump
 case $AFS_SYSNAME in
        sgi_6?)
                KDUMP=kdump.IP20;;
-       sun4x_5[789] | hp_ux11*)
+       sun4x_5[[789]] | hp_ux11*)
                KDUMP=kdump32
                KDUMP64=kdump64;;
        *linux*)

diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in
index 6a69044bacfe6fcf6a2b5850d1d1f225951b2b7e..fb57b627f7e1e6ffbe13289a13133aba0edb65ce 100644 (file)
--- a/src/venus/Makefile.in
+++ b/src/venus/Makefile.in
@@ -102,7 +102,7 @@ ${DEST}/etc/${KDUMP}: ${KDUMP}
                ${INSTALL} -s $? $@ ;; \
        esac
 
-${DEST}/etc/kdump64: kdump64
+${DEST}/etc/${KDUMP64}: ${KDUMP64}
        -set -x; \
        case ${SYS_NAME} in \
        sun4x_5[789] | hp_ux11* |sunx86_5[789] ) \
@@ -239,23 +239,23 @@ ${KDUMP}.o: kdump.c ${INCLS} AFS_component_version_number.c
                *nbsd*) \
                        touch kdump.o ;; \
                *) \
-                       ${CC} ${KERN_DBG} ${KERN_OPTMZ} -I${TOP_INCDIR}/afs -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} -c ${srcdir}/kdump.c ;; \
+                       ${CC} ${KERN_DBG} ${KERN_OPTMZ} -I${TOP_SRCDIR} -I${TOP_INCDIR}/afs -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} -o ${KDUMP}.o -c ${srcdir}/kdump.c ;; \
        esac ;
 
-kdump64.o : kdump.c ${INCLS} AFS_component_version_number.c
+${KDUMP64}.o : kdump.c ${INCLS} AFS_component_version_number.c
        -set -x; \
        case ${SYS_NAME} in \
        sun4x_5[789] | hp_ux11* |sunx86_5[789] ) \
-               ${CC} ${KERN_DBG} ${KERN_OPTMZ} -I${TOP_INCDIR}/afs -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS64} -o kdump64.o -c ${srcdir}/kdump.c ;; \
+               ${CC} ${KERN_DBG} ${KERN_OPTMZ} -I${TOP_SRCDIR} -I${TOP_INCDIR}/afs -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS64} -o ${KDUMP64}.o -c ${srcdir}/kdump.c ;; \
        esac
 
 ${KDUMP}:  ${KDUMP}.o
        -set -x; \
        case ${SYS_NAME} in \
        sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53 | sun4_53 | sun4_54 | sun4c_54 | sun4m_54 | sunx86_5? ) \
-               ${CC} -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a  ${TOP_LIBDIR}/util.a /usr/lib/libkvm.a -lelf ${XLIBS} ;; \
+               ${CC} -o ${KDUMP} ${KDUMP}.o ${TOP_LIBDIR}/libcmd.a  ${TOP_LIBDIR}/util.a /usr/lib/libkvm.a -lelf ${XLIBS} ;; \
        sun*_5? ) \
-               ${CC} -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a  ${TOP_LIBDIR}/util.a  ${XLIBELFA} ${XLIBKVM} ${XLIBS} ;; \
+               ${CC} -o ${KDUMP} ${KDUMP}.o ${TOP_LIBDIR}/libcmd.a  ${TOP_LIBDIR}/util.a  ${XLIBELFA} ${XLIBKVM} ${XLIBS} ;; \
        sgi_6? ) \
                for f in ../libafs/STATIC.IP*/CPU_KDEFS; \
                do      IP=`expr "$$f" : '../libafs/STATIC.\(IP..\)'`; \
@@ -288,11 +288,11 @@ ${KDUMP}:  ${KDUMP}.o
 
 ## kdump to read from 64 bit kernel dumps
 
-kdump64 : kdump64.o
+${KDUMP64}: ${KDUMP64}.o
        -set -x; \
        case ${SYS_NAME} in \
        sun4x_5[789] | hp_ux11* |sunx86_5[789] )  \
-               ${CC} ${XCFLAGS64} -o kdump64 kdump64.o ${TOP_LIBDIR}/libcmd64.a ${XLIBELFA} ${XLIBKVM} ${XLIBS} ;; \
+               ${CC} ${XCFLAGS64} -o ${KDUMP64} ${KDUMP64}.o ${TOP_LIBDIR}/libcmd64.a ${XLIBELFA} ${XLIBKVM} ${XLIBS} ;; \
        esac
 
 #