Sync with the actual build script used on www.FreeBSD.org:

Make this script work with newer version of make(1).  If DESTDIR is set
on the make command line it cannot be overridden in www/en/doc etc.

This makes the script work with FreeBSD 6.X+.
This commit is contained in:
Simon L. B. Nielsen 2008-02-26 18:47:23 +00:00
parent 99404c26ed
commit 4ddb7c9cc2
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/www/; revision=31543

View file

@ -37,7 +37,7 @@
# 2 - failure in CVS operations
# 3 - failure in make operations
#
# $FreeBSD: www/tools/webupdate,v 1.14 2004/11/07 11:04:09 simon Exp $
# $FreeBSD: www/tools/webupdate,v 1.15 2005/07/15 15:27:43 hrs Exp $
#
#
@ -60,7 +60,7 @@ PATH=${PATH:-${DEFAULT_PATH}}; export PATH;
CVSROOT=${CVSROOT:-${DEFAULT_CVSROOT}}; export CVSROOT;
BUILDDIR=${BUILDDIR:-${DEFAULT_BUILDDIR}};
LOGDIR=${LOGDIR:-${DEFAULT_LOGDIR}};
DESTDIR=${DESTDIR:-${DEFAULT_DESTDIR}};
DESTDIR=${DESTDIR:-${DEFAULT_DESTDIR}}; export DESTDIR
LOGFILE=${LOGFILE:-${LOGDIR}/${DEFAULT_LOGFILE}};
BUILDARGS=${BUILDARGS:-${DEFAULT_BUILDARGS}};
INSTARGS="${BUILDARGS} ${INSTARGS:-${DEFAULT_INSTARGS}}";
@ -149,7 +149,7 @@ fi
cd $BUILDDIR/www/en || exit 1;
time make ${BUILDARGS} all >> $LOGFILE 2>&1 &&
time make ${INSTARGS} DESTDIR=$DESTDIR install >> $LOGFILE 2>&1 ||
time make ${INSTARGS} install >> $LOGFILE 2>&1 ||
(tail -50 $LOGFILE |
mail -s "FreeBSD web build failed on `hostname`" $WEBMAILTO;
exit 3) || exit 3;