libafsrpc-makefile-fix-20071110

[openafs.git] / src / libafsrpc / Makefile.in

diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in
index 482047c..8d967cb 100644 (file)
--- a/src/libafsrpc/Makefile.in
+++ b/src/libafsrpc/Makefile.in
@@ -11,6 +11,10 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 
 CC=${MT_CC}
@@ -129,10 +133,8 @@ LIBOBJS = \
 
 all: ${TOP_LIBDIR}/libafsrpc.a
 
-install: ${DESTDIR}${libdir}/libafsrpc.a
-
-${DEST}/lib/libafsrpc.a: libafsrpc.a
-       ${INSTALL} $? $@
+${TOP_LIBDIR}/libafsrpc.a: libafsrpc.a
+       ${INSTALL_DATA} $? $@
 
 libafsrpc.a: ${LIBOBJS}
        $(RM) -f $@
@@ -354,7 +356,7 @@ fasttime.o: ${LWP}/fasttime.c
 syscall.o: ${SYS}/syscall.s
        case "$(SYS_NAME)" in \
             sun4x_5* | sunx86_5*) \
-               /usr/ccs/lib/cpp  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
+               $(CPP)  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
                as -o syscall.o syscall.ss;             \
                $(RM) syscall.ss;;                              \
         sgi_* | *_darwin_* ) \
@@ -363,10 +365,10 @@ syscall.o: ${SYS}/syscall.s
                ${AS} -P ${CFLAGS} -D_NO_PROTO -DMACH -DOSF -nostdinc -traditional -DASSEMBLER ${SYS}/syscall.s; \
                ${AS} -o syscall.o syscall.i; \
                $(RM) -f syscall.ss syscall.i;; \
-        *fbsd* | *nbsd* ) \
+        *bsd* ) \
                touch syscall.o ;; \
         *) \
-               /lib/cpp  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
+               $(CPP)  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
                as -o syscall.o syscall.ss;             \
                $(RM) syscall.ss;;                              \
        esac
@@ -380,8 +382,8 @@ rxstat.cs.o: ${TOP_OBJDIR}/src/rxstat/rxstat.cs.c
 rxstat.ss.o: ${TOP_OBJDIR}/src/rxstat/rxstat.ss.c
        ${CCRULE} ${TOP_OBJDIR}/src/rxstat/rxstat.ss.c
 
-rxstat.xdr.o: ${TOP_OBJDIR}/src/rxstat//rxstat.xdr.c
-       ${CCRULE} ${TOP_OBJDIR}/src/rxstat//rxstat.xdr.c
+rxstat.xdr.o: ${TOP_OBJDIR}/src/rxstat/rxstat.xdr.c
+       ${CCRULE} ${TOP_OBJDIR}/src/rxstat/rxstat.xdr.c
 
 afsint.cs.o: ${TOP_OBJDIR}/src/fsint/afsint.cs.c
        ${CCRULE} ${TOP_OBJDIR}/src/fsint/afsint.cs.c
@@ -398,14 +400,13 @@ afscbint.xdr.o: ${TOP_OBJDIR}/src/fsint/afscbint.xdr.c
 afsaux.o: ${FSINT}/afsaux.c
        ${CCRULE} ${FSINT}/afsaux.c
 
-clean:
-       $(RM) -f *.o libafsrpc*
+install: libafsrpc.a
+       ${INSTALL} -d ${DESTDIR}${libdir}
+       ${INSTALL_DATA} libafsrpc.a ${DESTDIR}${libdir}/libafsrpc.a
 
-${DESTDIR}${libdir}/libafsrpc.a: libafsrpc.a
-       ${INSTALL} $? $@
-
-${TOP_LIBDIR}/libafsrpc.a: libafsrpc.a
-       ${INSTALL} $? $@
-
-dest: ${DEST}/lib/libafsrpc.a
+dest: libafsrpc.a
+       ${INSTALL} -d ${DEST}/lib
+       ${INSTALL_DATA} libafsrpc.a ${DEST}/lib/libafsrpc.a
 
+clean:
+       $(RM) -f *.o libafsrpc*