CVS commit: pkgsrc/mk

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

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.

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