diff options
| author | roy <roy@pkgsrc.org> | 2019-01-22 14:29:44 +0000 |
|---|---|---|
| committer | roy <roy@pkgsrc.org> | 2019-01-22 14:29:44 +0000 |
| commit | 6a44ffa3358dfe84569b497ba426fdbba0448b02 (patch) | |
| tree | 174f1732ea65d420fe7d655dbbcf8934317705df /mk | |
| parent | 69055c8921a456687009d3b3780dc36831d539ea (diff) | |
| download | pkgsrc-6a44ffa3358dfe84569b497ba426fdbba0448b02.tar.gz | |
Call replace-names before SU
This allows the replace target to work with OBJ on NFS where root
isn't allowed.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/install/replace.mk | 3 | ||||
| -rw-r--r-- | mk/pkgformat/pkg/replace.mk | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mk/install/replace.mk b/mk/install/replace.mk index 9c30da0a10c..73aaa046065 100644 --- a/mk/install/replace.mk +++ b/mk/install/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.18 2016/04/10 15:58:02 joerg Exp $ +# $NetBSD: replace.mk,v 1.19 2019/01/22 14:29:44 roy Exp $ # # Public targets: # @@ -28,6 +28,7 @@ _REPLACE_TARGETS+= stage-package-create _REPLACE_TARGETS+= package .endif _REPLACE_TARGETS+= replace-message +_REPLACE_TARGETS+= replace-names _REPLACE_TARGETS+= unprivileged-install-hook # diff --git a/mk/pkgformat/pkg/replace.mk b/mk/pkgformat/pkg/replace.mk index c3c6ce2d7a6..91c064c3ad4 100644 --- a/mk/pkgformat/pkg/replace.mk +++ b/mk/pkgformat/pkg/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.5 2017/08/19 00:30:19 jlam Exp $ +# $NetBSD: replace.mk,v 1.6 2019/01/22 14:29:44 roy Exp $ # # _pkgformat-destdir-replace: @@ -11,7 +11,6 @@ # to installing the new package, should be one transaction. # _pkgformat-replace: \ - replace-names \ replace-tarup \ replace-preserve-installed-info \ replace-preserve-required-by \ @@ -24,7 +23,6 @@ _pkgformat-replace: \ # tarup is omitted for DESTDIR, because the benefits are very small _pkgformat-destdir-replace: \ - replace-names \ replace-destdir \ .PHONY |