docs/118261: [patch] Base NTP: NO_NTP support + NO_SHAREDOCS applies to NTP's HTMLs

[Tom Rhodes]

The following reply was made to PR docs/118261; it has been noted by GNATS.

From: Tom Rhodes <trhodes at FreeBSD.org>
To: bug-followup at FreeBSD.org
Cc: "Denis Eremenko <moonshade at pnhz.kz>" <moonshade at pnhz.kz>
Subject: Re: docs/118261: [patch] Base NTP: NO_NTP support + NO_SHAREDOCS
 applies to NTP's HTMLs
Date: Wed, 23 Jan 2008 20:48:44 -0500

 Hi,
 
 The patch here is actually incorrect and is the long way to do it.
 
 Looking at the Makefile(s) in question, it appears that NO_MAN
 implies both NO_MAN and NO_SHAREDOCS whether the user wants this
 or not.  I've submitted the following patch to another person
 for review.  It correctly wraps the manual pages in NO_MAN, and
 wraps the share docs into NO_SHAREDOCS.  The only issues I
 think the only other changes to this patch would probably be
 to not enter the docs directory at all if both NO_SHAREDOCS
 and NO_MAN are set.  This could be done with a different change
 to the Makefile if:
 
 .if !defined(NO_SHAREDOCS) && !defined(NO_MAN)
 subdir+=	doc
 .endif
 
 In place of my change which implicitly adds the doc subdir to
 the list.
 
 --- doc/Makefile	25 May 2006 20:22:54 -0000	1.11.2.1
 +++ doc/Makefile	24 Jan 2008 01:42:50 -0000
 @@ -1,5 +1,6 @@
  # $FreeBSD: src/usr.sbin/ntp/doc/Makefile,v 1.11.2.1 2006/05/25 20:22:54 pav Exp $
  
 +.if !defined(NO_SHAREDOCS)
  FILESDIR=	${SHAREDIR}/doc/ntp
  
  FILES=	accopt.html assoc.html audio.html authopt.html build.html \
 @@ -19,10 +20,14 @@
  	pps.html prefer.html quick.html rdebug.html refclock.html \
  	release.html tickadj.html
  
 +.PATH: ${.CURDIR}/../../../contrib/ntp/html \
 +        ${.CURDIR}/../../../contrib/ntp/html/drivers
 +
 +.endif
 +
 +.if !defined(NO_MAN)
  MAN=	ntp.conf.5 ntp.keys.5
  MAN+=	ntp-keygen.8 ntpd.8 ntpdate.8 ntpdc.8 ntpq.8 ntptime.8 ntptrace.8
 -
 -.PATH: ${.CURDIR}/../../../contrib/ntp/html \
 -	${.CURDIR}/../../../contrib/ntp/html/drivers
 +.endif
  
  .include <bsd.prog.mk>
 
 Thanks,
 
 -- 
 Tom Rhodes