From 6ded366aaa1fd4c546a124d55756d0f3bc35158a Mon Sep 17 00:00:00 2001 From: Satoshi Asami Date: Fri, 23 May 1997 08:24:00 +0000 Subject: [PATCH] Use ${DESTDIR} correctly in front of absolute paths. --- lib/libc/Makefile | 6 +++--- lib/libc/yp/Makefile.inc | 4 ++-- lib/librpcsvc/Makefile | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 6bb65a12c7fc..ef476fa5f41e 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 -# $Id$ +# $Id: Makefile,v 1.18 1997/05/03 03:49:51 jb Exp $ # # All library objects contain rcsid strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -29,11 +29,11 @@ KSRCS= bcmp.c ffs.c index.c mcount.c rindex.c strcat.c strcmp.c strcpy.c \ libkern: libkern.gen libkern.${MACHINE} libkern.gen: ${KQSRCS} ${KSRCS} - cp -p ${.CURDIR}/quad/quad.h ${.ALLSRC} /sys/libkern + cp -p ${.CURDIR}/quad/quad.h ${.ALLSRC} ${DESTDIR}/sys/libkern libkern.${MACHINE}:: ${KMSRCS} .if defined(KMSRCS) && !empty(KMSRCS) - cp -p ${.ALLSRC} /sys/libkern/${MACHINE} + cp -p ${.ALLSRC} ${DESTDIR}/sys/libkern/${MACHINE} .endif .include diff --git a/lib/libc/yp/Makefile.inc b/lib/libc/yp/Makefile.inc index 9cfb6333764a..a1c9473e6680 100644 --- a/lib/libc/yp/Makefile.inc +++ b/lib/libc/yp/Makefile.inc @@ -1,5 +1,5 @@ # from: @(#)Makefile.inc 5.3 (Berkeley) 2/20/91 -# $Id: Makefile.inc,v 1.4 1997/02/22 15:04:58 peter Exp $ +# $Id: Makefile.inc,v 1.5 1997/05/03 03:50:06 jb Exp $ # yp sources .PATH: ${.CURDIR}/../libc/yp @@ -7,7 +7,7 @@ SRCS+= xdryp.c yp_xdr.c yplib.c CLEANFILES+= yp_xdr.c yp.h -RPCSRC= ${.DESTDIR}/usr/include/rpcsvc/yp.x +RPCSRC= ${DESTDIR}/usr/include/rpcsvc/yp.x RPCGEN= rpcgen yp_xdr.c: ${RPCSRC} yp.h diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile index 6e96c6185f40..3680d0a0a980 100644 --- a/lib/librpcsvc/Makefile +++ b/lib/librpcsvc/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.10 (Berkeley) 6/24/90 -# $Id$ +# $Id: Makefile,v 1.8 1997/02/22 15:07:51 peter Exp $ .PATH: ${DESTDIR}/usr/include/rpcsvc @@ -10,7 +10,7 @@ RPCSRCS= klm_prot.x mount.x nfs_prot.x nlm_prot.x rex.x rnusers.x \ RPCCOM = rpcgen -INCDIRS= -I/usr/include/rpcsvc +INCDIRS= -I${DESTDIR}/usr/include/rpcsvc CFLAGS+= ${INCDIRS} SRCS= ${RPCSRCS:R:S/$/_xdr.c/g}