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.
This commit is contained in:
parent
365a44db75
commit
d7f4fc69b4
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=29503
6
Makefile
6
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:
|
# Make command line options:
|
||||||
# -DCLOBBER will remove /usr/include
|
# -DCLOBBER will remove /usr/include
|
||||||
@ -260,7 +260,7 @@ buildworld:
|
|||||||
@echo "--------------------------------------------------------------"
|
@echo "--------------------------------------------------------------"
|
||||||
@echo " Rebuilding /usr/include"
|
@echo " Rebuilding /usr/include"
|
||||||
@echo "--------------------------------------------------------------"
|
@echo "--------------------------------------------------------------"
|
||||||
cd ${.CURDIR} && ${BMAKE} includes
|
cd ${.CURDIR} && SHARED=symlinks ${BMAKE} includes
|
||||||
@echo
|
@echo
|
||||||
@echo "--------------------------------------------------------------"
|
@echo "--------------------------------------------------------------"
|
||||||
@echo " Rebuilding tools needed to build the libraries"
|
@echo " Rebuilding tools needed to build the libraries"
|
||||||
@ -450,7 +450,7 @@ includes:
|
|||||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
|
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
|
||||||
-p ${DESTDIR}/usr/include
|
-p ${DESTDIR}/usr/include
|
||||||
.endif
|
.endif
|
||||||
cd ${.CURDIR}/include && ${MAKE} all beforeinstall
|
cd ${.CURDIR}/include && ${MAKE} all install
|
||||||
cd ${.CURDIR}/gnu/include && ${MAKE} install
|
cd ${.CURDIR}/gnu/include && ${MAKE} install
|
||||||
cd ${.CURDIR}/gnu/lib/libmp && ${MAKE} beforeinstall
|
cd ${.CURDIR}/gnu/lib/libmp && ${MAKE} beforeinstall
|
||||||
cd ${.CURDIR}/gnu/lib/libobjc && ${MAKE} beforeinstall
|
cd ${.CURDIR}/gnu/lib/libobjc && ${MAKE} beforeinstall
|
||||||
|
Loading…
Reference in New Issue
Block a user