Received: by mail.netbsd.org (Postfix, from userid 605) id 1E42984DC6; Mon, 23 Mar 2020 11:27:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 993B684DBB for ; Mon, 23 Mar 2020 11:27:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id gOH5QJAaCHRv for ; Mon, 23 Mar 2020 11:27:30 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id E974884D41 for ; Mon, 23 Mar 2020 11:27:29 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id AE825FB27; Mon, 23 Mar 2020 11:27:29 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_158496284913990" MIME-Version: 1.0 Date: Mon, 23 Mar 2020 11:27:29 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/mk To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20200323112729.AE825FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_158496284913990 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Mon Mar 23 11:27:29 UTC 2020 Modified Files: pkgsrc/mk: subst.mk Log Message: mk/subst.mk: Unbreak builds with no substitutions. At least some implementations of rmdir(1) do not allow you to remove the current working directory. Fixes bootstrap on SunOS. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 pkgsrc/mk/subst.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_158496284913990 Content-Disposition: inline Content-Length: 786 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/subst.mk diff -u pkgsrc/mk/subst.mk:1.71 pkgsrc/mk/subst.mk:1.72 --- pkgsrc/mk/subst.mk:1.71 Sun Mar 22 18:43:46 2020 +++ pkgsrc/mk/subst.mk Mon Mar 23 11:27:29 2020 @@ -1,4 +1,4 @@ -# $NetBSD: subst.mk,v 1.71 2020/03/22 18:43:46 rillig Exp $ +# $NetBSD: subst.mk,v 1.72 2020/03/23 11:27:29 jperkin Exp $ # # The subst framework replaces text in one or more files in the WRKSRC # directory. Packages can define several ``classes'' of replacements. @@ -185,6 +185,6 @@ ${_SUBST_COOKIE.${_class_}}: ${FAIL_MSG} "[subst.mk:${_class_}] The pattern $$pattern has no effect."; \ fi; \ done; \ - ${RMDIR} "$$emptydir" + cd ${WRKDIR}; ${RMDIR} "$$emptydir" ${RUN} ${TOUCH} ${TOUCH_FLAGS} ${.TARGET}.tmp && ${MV} ${.TARGET}.tmp ${.TARGET} .endfor --_----------=_158496284913990--