d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
green 2000-01-11 12:51:56 +00:00
parent eda181946c
commit f5d02a1957
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.inc1
View File

@ -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"

2
gnu/lib/libdialog/Makefile
View File

@ -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 \

2
lib/libncurses/Makefile
View File

@ -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

2
lib/ncurses/ncurses/Makefile
View File

@ -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