diff --git a/gnu/lib/libg++/libg++/Makefile b/gnu/lib/libg++/libg++/Makefile index 2de59df4237f..da9352eed86c 100644 --- a/gnu/lib/libg++/libg++/Makefile +++ b/gnu/lib/libg++/libg++/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.23 1994/02/10 01:47:47 cgd Exp $ +# $Id: Makefile,v 1.24 1994/07/06 04:06:27 mycroft Exp $ LIB= g++ @@ -21,8 +21,8 @@ SRCS= AllocRing.cc Obstack.cc builtin.cc \ CXXFLAGS+= -nostdinc++ -I$(.CURDIR)/../g++-include \ -I$(.CURDIR)/../iostream CFLAGS+= -I$(.CURDIR) -LDADD= /usr/lib/c++rt0.o -lcurses -DPADD= /usr/lib/c++rt0.o ${LIBCURSES} +LDADD= ${DESTDIR}/usr/lib/c++rt0.o -lcurses +DPADD= ${DESTDIR}/usr/lib/c++rt0.o ${LIBCURSES} NOMAN= noman .PATH: $(.CURDIR)/../iostream LIBCURSES!= printf "xxx:\n\techo \$${LIBCURSES}\n.include " |\ diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 5e220beae908..128ebdfa58ae 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.2 (Berkeley) 3/5/91 -# $Id: Makefile,v 1.26 1994/06/30 06:44:54 deraadt Exp $ +# $Id: Makefile,v 1.27 1994/07/06 04:06:43 mycroft Exp $ # # All library objects contain sccsid strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -13,6 +13,9 @@ LIB=c CFLAGS+=-DYP -DLIBC_SCCS -DSYSLIBC_SCCS AINC= -I${.CURDIR}/arch/${MACHINE_ARCH} +.if defined(DESTDIR) +AINC+= -nostdinc -idirafter ${DESTDIR}/usr/include +.endif .if exists (${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc) .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}