svn commit: r320285 - head

[Bryan Drewery]

Author: bdrewery
Date: Fri Jun 23 18:27:00 2017
New Revision: 320285
URL: https://svnweb.freebsd.org/changeset/base/320285

Log:
  Expose only the create-packages-* targets since they set needed DEST/DIRDIR.
  
  The other targets just fail confusingly otherwise.
  
  MFC after:	2 weeks
  Sponsored by:	Dell EMC Isilon

Modified:
  head/Makefile
  head/Makefile.inc1

Modified: head/Makefile
==============================================================================
--- head/Makefile	Fri Jun 23 18:26:57 2017	(r320284)
+++ head/Makefile	Fri Jun 23 18:27:00 2017	(r320285)
@@ -131,7 +131,7 @@ TGTS=	all all-man buildenv buildenvvars buildkernel bu
 	build32 distribute32 install32 buildsoft distributesoft installsoft \
 	builddtb xdev xdev-build xdev-install \
 	xdev-links native-xtools stageworld stagekernel stage-packages \
-	create-world-packages create-kernel-packages create-packages \
+	create-packages-world create-packages-kernel create-packages \
 	packages installconfig real-packages sign-packages package-pkg \
 	print-dir test-system-compiler
 

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri Jun 23 18:26:57 2017	(r320284)
+++ head/Makefile.inc1	Fri Jun 23 18:27:00 2017	(r320285)
@@ -1553,12 +1553,14 @@ _repodir: .PHONY
 
 create-packages-world:	_pkgbootstrap _repodir .PHONY
 	${_+_}@cd ${.CURDIR}; \
-		${MAKE} DESTDIR=${WSTAGEDIR} \
+		${MAKE} -f Makefile.inc1 \
+			DESTDIR=${WSTAGEDIR} \
 			PKG_VERSION=${PKG_VERSION} create-world-packages
 
 create-packages-kernel:	_pkgbootstrap _repodir .PHONY
 	${_+_}@cd ${.CURDIR}; \
-		${MAKE} DESTDIR=${KSTAGEDIR} \
+		${MAKE} -f Makefile.inc1 \
+			DESTDIR=${KSTAGEDIR} \
 			PKG_VERSION=${PKG_VERSION} DISTDIR=kernel \
 			create-kernel-packages