Date: Mon, 13 Apr 2015 21:29:41 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r281503 - head/share/mk Message-ID: <201504132129.t3DLTfwq027110@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Mon Apr 13 21:29:40 2015 New Revision: 281503 URL: https://svnweb.freebsd.org/changeset/base/281503 Log: Revert r281055 as it breaks installing test scripts in the mixed PROGS/SCRIPT case Repro is as follows: % sudo pkg install -y kyua % sudo rm -Rf /usr/tests % sudo make hier % (cd lib/libthr/tests/; make obj; make depend; make all; sudo make install) % (cd /usr/tests/lib/libthr; kyua list) Failure seen in Jenkins build starting here: https://jenkins.freebsd.org/job/FreeBSD_HEAD-tests2/927/ Pointyhat to: bapt Modified: head/share/mk/bsd.progs.mk Modified: head/share/mk/bsd.progs.mk ============================================================================== --- head/share/mk/bsd.progs.mk Mon Apr 13 20:23:46 2015 (r281502) +++ head/share/mk/bsd.progs.mk Mon Apr 13 21:29:40 2015 (r281503) @@ -96,14 +96,14 @@ x.$p= PROG_CXX=$p $p ${p}_p: .PHONY .MAKE (cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \ - SUBDIR= SCRIPTS= PROG=$p \ + SUBDIR= PROG=$p \ DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \ ${x.$p}) .for t in ${PROGS_TARGETS:O:u} $p.$t: .PHONY .MAKE (cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \ - SUBDIR= SCRIPTS= PROG=$p \ + SUBDIR= PROG=$p \ DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \ ${x.$p} ${@:E}) .endfor
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504132129.t3DLTfwq027110>