From d7f4fc69b49d4907d4becd69d7511cb762b2a5b8 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Tue, 16 Sep 1997 10:45:41 +0000 Subject: [PATCH] Backed out rev.1.136 and rev.1.144. Force SHARED=symlinks in a different way - for buildworld only. Rev.1.136 broke the (deprecated) external includes target. Rev.1.144 was a half-baked backout of rev.1.136. It broke SHARED=symlinks for the buildworld target and installation of subdirs of src/include for the includes target. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d3d11816649e..d585fef4dd08 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.143 1997/09/05 09:11:24 peter Exp $ +# $Id: Makefile,v 1.144 1997/09/15 05:58:50 rgrimes Exp $ # # Make command line options: # -DCLOBBER will remove /usr/include @@ -260,7 +260,7 @@ buildworld: @echo "--------------------------------------------------------------" @echo " Rebuilding /usr/include" @echo "--------------------------------------------------------------" - cd ${.CURDIR} && ${BMAKE} includes + cd ${.CURDIR} && SHARED=symlinks ${BMAKE} includes @echo @echo "--------------------------------------------------------------" @echo " Rebuilding tools needed to build the libraries" @@ -450,7 +450,7 @@ includes: mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${DESTDIR}/usr/include .endif - cd ${.CURDIR}/include && ${MAKE} all beforeinstall + cd ${.CURDIR}/include && ${MAKE} all install cd ${.CURDIR}/gnu/include && ${MAKE} install cd ${.CURDIR}/gnu/lib/libmp && ${MAKE} beforeinstall cd ${.CURDIR}/gnu/lib/libobjc && ${MAKE} beforeinstall