RFC: Killing WITHOUT_DOC

[Tom Rhodes]

Hey all,

The patch below kills WITHOUT_DOC from the www/ tree.  My recent fix
makes it possible to build www without a doc tree requirement;
however, one must still define WITHOUT_DOC and WEB_ONLY.  They
both do almost the same thing:

WITHOUT_DOC: Cuts out the requirement to have a doc tree by not
including specific XML build glue.

WEB_ONLY: Cuts out other requirements on the doc tree but leaves
in the includes of XML build glue.

The only difference *I* see is that when WITHOUT_DOC is defined,
the transtable XML files are not built which has a slight negative
impact in localized files.  If someone was using WEB_ONLY, they
should know this.  The following patch turns specific WITHOUT_DOC
if checks and documentation (six lines) into WEB_ONLY.  Comments?

-- 
Tom Rhodes

Index: share/mk/web.site.mk
===================================================================
RCS file: /home/dcvs/www/share/mk/web.site.mk,v
retrieving revision 1.76
diff -u -r1.76 web.site.mk
--- share/mk/web.site.mk        22 Sep 2006 21:05:04 -0000      1.76
+++ share/mk/web.site.mk        7 Oct 2006 05:25:53 -0000
@@ -125,9 +125,9 @@
 #
 # for dependency
 #
-.if !defined(WITHOUT_DOC)
+.if !defined(WEB_ONLY)
 #
-# When WITHOUT_DOC is not defined, we use doc.common.mk.
+# When WEB_ONLY is not defined, we use doc.common.mk.
 #
 DOC_PREFIX?=   ${WEB_PREFIX}/../doc
 .if exists(${DOC_PREFIX}/share/mk/doc.common.mk)
@@ -135,12 +135,12 @@
 .include "${DOC_PREFIX}/share/mk/doc.xml.mk"
 .else
 .error ${DOC_PREFIX}/share/mk/doc.common.mk not found.\
-       Define $$WITHOUT_DOC and $$WEB_ONLY for performing a partial\
+       Define $$WEB_ONLY for performing a partial\
        build without the doc/ module.
 .endif
-.else # !defined(WITHOUT_DOC)
+.else # !defined(WEB_ONLY)
 #
-# When WITHOUT_DOC is defined, we should not use files in doc/ module at all.
+# When WEB_ONLY is defined, we should not use files in doc/ module at all.
 #
 .if !defined(WWW_LANGCODE) || empty(WWW_LANGCODE)
 _WEB_PREFIX!=                  realpath ${WEB_PREFIX}
@@ -148,7 +148,7 @@
 .undef _WEB_PREFIX
 .include "${WEB_PREFIX}/share/mk/doc.xml.mk"
 .endif
-.endif # !defined(WITHOUT_DOC)
+.endif # !defined(WEB_ONLY)
 
 _INCLIST=      navibar.ent \
                navibar.l10n.ent \