From owner-svn-doc-head@FreeBSD.ORG  Thu Jan  8 19:15:48 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 03FC37E1;
 Thu,  8 Jan 2015 19:15:48 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E3BD5BF5;
 Thu,  8 Jan 2015 19:15:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t08JFlvk047581;
 Thu, 8 Jan 2015 19:15:47 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t08JFlYp047580;
 Thu, 8 Jan 2015 19:15:47 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201501081915.t08JFlYp047580@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 8 Jan 2015 19:15:47 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46168 - head/share/examples
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jan 2015 19:15:48 -0000

Author: gjb
Date: Thu Jan  8 19:15:47 2015
New Revision: 46168
URL: https://svnweb.freebsd.org/changeset/doc/46168

Log:
  Work around suspected broken logic in the handling
  of TESTSBASE and/or TESTSDIR in base/head/.
  
  My observations suggest when TESTSBASE is specified
  as a make(1) variable, DESTDIR seems to get lost if
  NO_ROOT is also specified.
  
  To work around this, export DESTDIR earlier, and
  explicitly prefix TESTSBASE and TESTSDIR with its
  value.
  
  This fixed refreshing the man-refs.ent file from
  a recent checkout of base/head/.
  
  While here, bump the Copyright year.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/share/examples/missing-manrefs.sh

Modified: head/share/examples/missing-manrefs.sh
==============================================================================
--- head/share/examples/missing-manrefs.sh	Thu Jan  8 09:24:13 2015	(r46167)
+++ head/share/examples/missing-manrefs.sh	Thu Jan  8 19:15:47 2015	(r46168)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #-
-# Copyright (c) 2014 The FreeBSD Foundation
+# Copyright (c) 2014, 2015 The FreeBSD Foundation
 # All rights reserved.
 #
 # This software was developed by Glen Barber under sponsorship
@@ -57,9 +57,11 @@ outdir=$(mktemp -d /tmp/manrefresh.outdi
 objdir=$(mktemp -d /tmp/manrefresh.objdir.XXXXXX)
 
 build_manpages() {
-	MAKEOBJDIRPREFIX=${objdir}
-	export MAKEOBJDIRPREFIX
-	make -s -C ${srcs} DESTDIR=${outdir} \
+	export MAKEOBJDIRPREFIX=${objdir}
+	export DESTDIR=${outdir}
+	export TESTSBASE=${DESTDIR}/usr/tests
+	export TESTSDIR=${DESTDIR}/usr/tests
+	make -s -C ${srcs} DESTDIR=${DESTDIR} \
 		SRCCONF=/dev/null __MAKE_CONF=/dev/null \
 		MANOWN=$USER MANGRP=$USER MANMODE=0666 \
 		NO_MLINKS=1 -DNO_ROOT obj hier all-man maninstall