svn commit: r337991 - head

[Bjoern A. Zeeb]

Author: bz
Date: Fri Aug 17 21:19:18 2018
New Revision: 337991
URL: https://svnweb.freebsd.org/changeset/base/337991

Log:
  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.

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri Aug 17 21:12:16 2018	(r337990)
+++ head/Makefile.inc1	Fri Aug 17 21:19:18 2018	(r337991)
@@ -1765,7 +1765,7 @@ create-packages: .PHONY create-packages-world create-p
 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##*/} ; \