svn commit: r46168 - head/share/examples

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
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"