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
This commit is contained in:
Glen Barber 2015-01-08 19:15:47 +00:00
parent 17e6116bd6
commit 33309ad8b1
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=46168

View file

@ -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.outdir.XXXXXX)
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