www/78239: [patch] Building www from cvs without doc

[Devon H. O'Dell]

>Number:         78239
>Category:       www
>Synopsis:       [patch] Building www from cvs without doc
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-www
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 01 12:40:11 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Devon H. O'Dell
>Release:        N/A
>Organization:
Offmyserver
>Environment:
N/A

>Description:
	I might be missing something here, but it appears to me to be
	impossible to build the www tree without also having the doc/
	module.

>How-To-Repeat:
	From a checkout of www sources, simply:

	> make
	"/usr/home/dodell/www/en/../share/mk/web.site.mk", line
	134: /usr/home/dodell/www/en/../../doc/share/mk/doc.common.mk not found.
	Define $WITHOUT_DOC for building without the doc/ module.

	Ok, so I run:

	> make -DWITHOUT_DOC
	:
	: builds a bit
	:
	cd: can't cd to /usr/home/dodell/www/en/doc/../../../doc/en_US.ISO8859-1

	It would appear to me that since I told it I wanted to build without
	the doc/ module, it should not try to at any point during the build
>Fix:
	The following patch corrects the issue for me.

--- en/Makefile Mon Feb 28 07:37:00 2005
+++ en/Makefile Mon Feb 28 07:37:23 2005
@@ -60,7 +60,9 @@
 SUBDIR+= snapshots
 SUBDIR+= tutorials
 .if !defined(WEB_ONLY) || empty(WEB_ONLY)
+.if !defined(WITHOUT_DOC)
 SUBDIR+= doc
+.endif
 SUBDIR+= ports
 .endif
 .if defined(BUILD_RELNOTES)
--- share/mk/web.site.mk.old    Mon Feb 28 07:41:42 2005
+++ share/mk/web.site.mk        Mon Feb 28 07:42:09 2005
@@ -131,7 +131,7 @@
 .include "${DOC_PREFIX}/share/mk/doc.common.mk"
 .else
 .error ${DOC_PREFIX}/share/mk/doc.common.mk not found.\
-	Define $$WITHOUT_DOC for building without the doc/ module.
+	Define $$WITHOUT_DOC for building without the doc/ module and $
$WEB_ONLY to only build the web sources (without doc or ports).
 .endif
 .else # !defined(WITHOUT_DOC)
 #
>Release-Note:
>Audit-Trail:
>Unformatted: