This is the second half of unbreaking the world build. Add a -DNOHTML

corollary for -DNOINFO and -DNOMAN.  I'll fix this properly (add
specific HTML doc magic) in the .mk files later; right now, just
unbreak the world.

4 files changed, 9 insertions, 6 deletions

diff --git a/Makefile.inc1 b/Makefile.inc1
index 7372b49..73c1ac2 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -142,7 +142,6 @@ TMPPATH=	${STRICTTMPPATH}:${PATH}
 # Common environment for bootstrap related stages
 BOOTSTRAPENV=	MAKEOBJDIRPREFIX=${WORLDTMP} \
 		DESTDIR=${WORLDTMP} \
-		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		MACHINE_ARCH=${BUILD_ARCH} \
 		TOOLS_PREFIX=${WORLDTMP} \
 		PATH=${TMPPATH}
@@ -156,24 +155,22 @@ CROSSENV=	MAKEOBJDIRPREFIX=${OBJTREE} \
 
 # bootstrap-tool stage
 BMAKEENV=	${BOOTSTRAPENV}
-BMAKE=		${BMAKEENV} ${MAKE} -f Makefile.inc1 -DNOMAN -DNOINFO
+BMAKE=		${BMAKEENV} ${MAKE} -f Makefile.inc1 -DNOMAN -DNOINFO -DNOHTML
 
 # build-tool stage
 TMAKEENV=	MAKEOBJDIRPREFIX=${OBJTREE} \
-		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH}
 TMAKE=		${TMAKEENV} ${MAKE} -f Makefile.inc1
 
 # cross-tool stage
 XMAKEENV=	${BOOTSTRAPENV} \
 		TARGET_ARCH=${MACHINE_ARCH}
-XMAKE=		${XMAKEENV} ${MAKE} -f Makefile.inc1 -DNOMAN -DNOINFO \
+XMAKE=		${XMAKEENV} ${MAKE} -f Makefile.inc1 -DNOMAN -DNOINFO -DNOHTML \
 		-DNO_FORTRAN -DNO_GDB
 
 # world stage
 WMAKEENV=	${CROSSENV} \
 		DESTDIR=${WORLDTMP} \
-		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH}
 WMAKE=		${WMAKEENV} ${MAKE} -f Makefile.inc1
 
@@ -253,7 +250,7 @@ buildworld:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 4: building libraries"
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}; ${WMAKE} -DNOINFO -DNOMAN libraries
+	cd ${.CURDIR}; ${WMAKE} -DNOHTML -DNOINFO -DNOMAN libraries
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 4: make dependencies"
diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile
index 858b59d..bf90e22 100644
--- a/gnu/lib/libdialog/Makefile
+++ b/gnu/lib/libdialog/Makefile
@@ -24,11 +24,13 @@ beforeinstall:
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/dialog.h \
 	      ${DESTDIR}/usr/include
 
+.if !defined(NOHTML)
 afterinstall:
 .for file in ${EXAMPLES}
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
 	      ${.CURDIR}/TESTS/${file} ${DESTDIR}/usr/share/examples/libdialog
 .endfor
+.endif
 
 MLINKS+=dialog.3 draw_shadow.3 dialog.3 draw_box.3 \
 	dialog.3 line_edit.3 dialog.3 strheight.3 \
diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile
index e3d5f6c..91409c7 100644
--- a/lib/libncurses/Makefile
+++ b/lib/libncurses/Makefile
@@ -253,12 +253,14 @@ beforeinstall:	${HEADERS}
 	rm -f ${DESTDIR}/usr/include/ncurses.h
 	ln -s curses.h ${DESTDIR}/usr/include/ncurses.h
 
+.if !defined(NOHTML)
 afterinstall:
 .for file in ${DOCS}
 	cd ${.CURDIR}/../../contrib/ncurses/misc ; \
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${file} \
 		${DESTDIR}${DOCSDIR}
 .endfor
+.endif
 
 # Generated source
 namehdr nameftr codeftr ${NAMESRC} ${CODESRC}: MKnames.awk Caps
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index e3d5f6c..91409c7 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -253,12 +253,14 @@ beforeinstall:	${HEADERS}
 	rm -f ${DESTDIR}/usr/include/ncurses.h
 	ln -s curses.h ${DESTDIR}/usr/include/ncurses.h
 
+.if !defined(NOHTML)
 afterinstall:
 .for file in ${DOCS}
 	cd ${.CURDIR}/../../contrib/ncurses/misc ; \
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${file} \
 		${DESTDIR}${DOCSDIR}
 .endfor
+.endif
 
 # Generated source
 namehdr nameftr codeftr ${NAMESRC} ${CODESRC}: MKnames.awk Caps