diff options
| author | Bjoern A. Zeeb <bz@FreeBSD.org> | 2018-08-17 21:19:18 +0000 |
|---|---|---|
| committer | Bjoern A. Zeeb <bz@FreeBSD.org> | 2018-08-17 21:19:18 +0000 |
| commit | 49f1692a3b504b32efc2d3d92660131036757ed6 (patch) | |
| tree | ed5642fae37a0a96c8e4f9c1e9172f8e5d195c9e /Makefile.inc1 | |
| parent | 3e5ba2e1874151201d78eb070b18f2300826457f (diff) | |
| download | src-test2-49f1692a3b504b32efc2d3d92660131036757ed6.tar.gz src-test2-49f1692a3b504b32efc2d3d92660131036757ed6.zip | |
METALOG, unless manually overwritten, is defined as ${DESTDIR}/${DISTDIR}/METALOG
In the create-world-packages target we manually piece this together (unless
it is undefined), without the DISTDIR. Normally DISTDIR is empty (unset) and
no one notices. Now DISTDIR is a well known long-standing PORTS environment
variable and if that is set in the local environment the path to METALOG
is wrong as it no longer is ${DESTDIR}/METALOG.
Long-term we should start to avoid "publicly well known" names for global
variables, for now just piece ${DISTDIR} in as well. This allows
create-world-packages to continue if DISTDIR is set in the env.
Notes
Notes:
svn path=/head/; revision=337991
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 621f1bfc5eac..d1fd7314ce9c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1765,7 +1765,7 @@ create-packages: .PHONY create-packages-world create-packages-kernel create-world-packages: _pkgbootstrap .PHONY @rm -f ${WSTAGEDIR}/*.plist 2>/dev/null || : @cd ${WSTAGEDIR} ; \ - env -i LC_COLLATE=C sort ${WSTAGEDIR}/METALOG | \ + env -i LC_COLLATE=C sort ${WSTAGEDIR}/${DISTDIR}/METALOG | \ awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk @for plist in ${WSTAGEDIR}/*.plist; do \ plist=$${plist##*/} ; \ |