pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk mk/subst.mk: Unbreak builds with no substitutions.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0aadaec7f22f
branches:  trunk
changeset: 413949:0aadaec7f22f
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Mon Mar 23 11:27:29 2020 +0000

description:
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.

diffstat:

 mk/subst.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (17 lines):

diff -r 0a54131f00cd -r 0aadaec7f22f mk/subst.mk
--- a/mk/subst.mk       Mon Mar 23 11:10:02 2020 +0000
+++ b/mk/subst.mk       Mon Mar 23 11:27:29 2020 +0000
@@ -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 @@
                ${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



Home | Main Index | Thread Index | Old Index