From 582ef25f944d28a5862c098dd2ea44497814efa1 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Tue, 21 Dec 2004 12:05:11 +0000
Subject: [PATCH] NOHTML -> NO_HTML

---
 Makefile.inc1                 | 6 +++---
 gnu/lib/libdialog/Makefile    | 2 +-
 lib/libncurses/Makefile       | 2 +-
 lib/ncurses/ncurses/Makefile  | 2 +-
 release/Makefile              | 2 +-
 release/picobsd/build/picobsd | 2 +-
 share/mk/bsd.compat.mk        | 1 +
 tools/tools/nanobsd/make.conf | 2 +-
 8 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 5bb9b1da9ed2..cd38bdb8d84e 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -182,7 +182,7 @@ BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		${BMAKEENV} ${MAKE} -f Makefile.inc1 \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
-		-DNOHTML -DNO_INFO -DNO_LINT -DNO_MAN -DNO_PIC -DNO_PROFILE \
+		-DNO_HTML -DNO_INFO -DNO_LINT -DNO_MAN -DNO_PIC -DNO_PROFILE \
 		-DNO_SHARED -DNO_CPU_CFLAGS -DNO_WARNS
 
 # build-tools stage
@@ -231,7 +231,7 @@ LIB32MAKEENV=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
 		SHLIBDIR=/usr/lib32
 
 LIB32MAKE=	${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
-		-DNO_BIND -DNO_MAN -DNO_INFO -DNOHTML \
+		-DNO_BIND -DNO_MAN -DNO_INFO -DNO_HTML \
 		CC="cc ${LIB32CC}" \
 		CXX="c++ ${LIB32CXX}" \
 		OBJC="cc ${LIB32OBJC}" \
@@ -364,7 +364,7 @@ _libraries:
 	@echo ">>> stage 4.2: building libraries"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; \
-	    ${WMAKE} -DNO_FSCHG -DNOHTML -DNO_INFO -DNO_LINT -DNO_MAN -DNO_PROFILE \
+	    ${WMAKE} -DNO_FSCHG -DNO_HTML -DNO_INFO -DNO_LINT -DNO_MAN -DNO_PROFILE \
 	    libraries
 _depend:
 	@echo
diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile
index 20566f7aaff4..9f64ca0c6e03 100644
--- a/gnu/lib/libdialog/Makefile
+++ b/gnu/lib/libdialog/Makefile
@@ -20,7 +20,7 @@ CFLAGS+= -I${.CURDIR} -Wall -Wstrict-prototypes -DLOCALE
 LDADD=	-lncurses
 DPADD=	${LIBNCURSES}
 
-.if !defined(NOHTML)
+.if !defined(NO_HTML)
 FILES=	${EXAMPLES:C;^;${.CURDIR}/TESTS/;}
 FILESDIR= ${SHAREDIR}/examples/libdialog
 .endif
diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile
index 3d7dcce22cf0..7eaa4dec71b9 100644
--- a/lib/libncurses/Makefile
+++ b/lib/libncurses/Makefile
@@ -253,7 +253,7 @@ SYMLINKS+=libncurses_p.a ${LIBDIR}/libtinfo_p.a
 DOCSDIR= /usr/share/doc/ncurses
 DOCS=	ncurses-intro.html hackguide.html
 
-.if !defined(NOHTML)
+.if !defined(NO_HTML)
 .PATH: ${NCURSES}/doc/html
 FILESGROUPS=	DOCS
 .endif
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index 3d7dcce22cf0..7eaa4dec71b9 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -253,7 +253,7 @@ SYMLINKS+=libncurses_p.a ${LIBDIR}/libtinfo_p.a
 DOCSDIR= /usr/share/doc/ncurses
 DOCS=	ncurses-intro.html hackguide.html
 
-.if !defined(NOHTML)
+.if !defined(NO_HTML)
 .PATH: ${NCURSES}/doc/html
 FILESGROUPS=	DOCS
 .endif
diff --git a/release/Makefile b/release/Makefile
index 4289affb592c..4af7c4529791 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -359,7 +359,7 @@ release rerelease:
 .endif
 	mkdir -p ${CHROOTDIR}
 	@echo ">>> make release for ${TARGET} started on `LC_ALL=C TZ=GMT date`"
-	cd ${WORLDDIR} && ${NATIVEMAKE} -DNO_GAMES -DNOHTML -DNO_INFO -DNO_MAN \
+	cd ${WORLDDIR} && ${NATIVEMAKE} -DNO_GAMES -DNO_HTML -DNO_INFO -DNO_MAN \
 	    -DNO_PROFILE installworld DESTDIR=${CHROOTDIR}
 	cd ${WORLDDIR}/etc && ${NATIVEMAKE} distribution DESTDIR=${CHROOTDIR}
 	if [ -f /etc/resolv.conf ]; then \
diff --git a/release/picobsd/build/picobsd b/release/picobsd/build/picobsd
index 14bf39a1c2dd..023201ff992b 100755
--- a/release/picobsd/build/picobsd
+++ b/release/picobsd/build/picobsd
@@ -182,7 +182,7 @@ create_includes_and_libraries() {
 	    BINOWN=`id -un` BINGRP=`id -gn` \
 	    DESTDIR=${l_usrtree}/.. \
 	    make -m ${SRC}/share/mk \
-		-DNOHTML -DNO_INFO -DNO_MAN -DNOSHARE -DNO_FSCHG "
+		-DNO_HTML -DNO_INFO -DNO_MAN -DNOSHARE -DNO_FSCHG "
 	log "do a 'make obj' in a few places."
 	# This is very version-specific... The following works for 5.0
 	for i in lib secure/lib gnu/lib usr.sbin/pcvt/keycap \
diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk
index 92365b76b104..c6edb8baa402 100644
--- a/share/mk/bsd.compat.mk
+++ b/share/mk/bsd.compat.mk
@@ -8,6 +8,7 @@
 	NOEXTRADEPEND:NO_EXTRADEPEND \
 	NOFSCHG:NO_FSCHG \
 	NOGAMES:NO_GAMES \
+	NOHTML:NO_HTML \
 	NOINET6:NO_INET6 \
 	NOINFO:NO_INFO \
 	NOINFOCOMPRESS:NO_INFOCOMPRESS \
diff --git a/tools/tools/nanobsd/make.conf b/tools/tools/nanobsd/make.conf
index 6e72850429c5..7e7245ff4ca2 100644
--- a/tools/tools/nanobsd/make.conf
+++ b/tools/tools/nanobsd/make.conf
@@ -18,7 +18,7 @@ NO_GAMES=
 NO_GCOV=
 NO_GDB=
 NO_HESIOD_LIBC=
-NOHTML=
+NO_HTML=
 NO_I4B=
 NO_INET6=
 NO_INFO=