Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 2 Aug 2017 20:23:25 +0000 (UTC)
From:      Ngie Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r321943 - projects/make-check-sandbox/share/mk
Message-ID:  <201708022023.v72KNPfA018949@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Wed Aug  2 20:23:25 2017
New Revision: 321943
URL: https://svnweb.freebsd.org/changeset/base/321943

Log:
  Only tweak DESTDIR, etc if actively invoking "make check"
  
  This fixes "make installworld"/"make install" (standard use).

Modified:
  projects/make-check-sandbox/share/mk/suite.test.mk

Modified: projects/make-check-sandbox/share/mk/suite.test.mk
==============================================================================
--- projects/make-check-sandbox/share/mk/suite.test.mk	Wed Aug  2 20:19:19 2017	(r321942)
+++ projects/make-check-sandbox/share/mk/suite.test.mk	Wed Aug  2 20:23:25 2017	(r321943)
@@ -101,7 +101,7 @@ realcheck: .PHONY
 	fi
 	@env ${TESTS_ENV:Q} ${KYUA} test -k ${CHECKDIR}/Kyuafile
 
-.ifdef _TESTS_USE_OBJDIR
+.if defined(_TESTS_USE_OBJDIR) && make(check)
 DESTDIR:=	${.OBJDIR}/checkdir
 CLEANDIRS+=	${DESTDIR}
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708022023.v72KNPfA018949>