diff options
| author | obache <obache> | 2013-05-23 13:18:56 +0000 |
|---|---|---|
| committer | obache <obache> | 2013-05-23 13:18:56 +0000 |
| commit | 9dea8a0d1e9e86ae7ef5b759b2a227e7cc43ee06 (patch) | |
| tree | 2a7139982fd87ee948f76117e980cc35c4bc7d0e /mk/install | |
| parent | 6b9b2ae231f8b4221e4870ec44454d92007f5038 (diff) | |
| download | pkgsrc-9dea8a0d1e9e86ae7ef5b759b2a227e7cc43ee06.tar.gz | |
prevent to generate binary package in ${PACKAGES} from the side effect of
`install' with USE_DESTDIR=yes.
This changes prevent to unwanted overwite of existing binary packages with
test installation (`stage-install', `replace' & `undo-replace', and so on).
To do both `install' and `package', you can still use `package-install' target,
same as USE_DESTDIR=no.
Diffstat (limited to 'mk/install')
| -rw-r--r-- | mk/install/bsd.install.mk | 4 | ||||
| -rw-r--r-- | mk/install/replace.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/install/bsd.install.mk b/mk/install/bsd.install.mk index 2486c5da14e..014f2f65e25 100644 --- a/mk/install/bsd.install.mk +++ b/mk/install/bsd.install.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.install.mk,v 1.13 2010/02/24 22:53:34 joerg Exp $ +# $NetBSD: bsd.install.mk,v 1.14 2013/05/23 13:18:56 obache Exp $ # # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to installing packages. @@ -25,7 +25,7 @@ _COOKIE.install= ${WRKDIR}/.install_done .if ${_USE_DESTDIR} == "no" install: stage-install .else -install: package-install +install: stage-package-install .endif ###################################################################### diff --git a/mk/install/replace.mk b/mk/install/replace.mk index 5fecc4d96f9..41a1ab6c929 100644 --- a/mk/install/replace.mk +++ b/mk/install/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.14 2011/10/15 00:23:09 reed Exp $ +# $NetBSD: replace.mk,v 1.15 2013/05/23 13:18:56 obache Exp $ # # Public targets: # @@ -28,7 +28,7 @@ .if ${_USE_DESTDIR} == "no" _REPLACE_TARGETS+= ${_PKGSRC_BUILD_TARGETS} .else -_REPLACE_TARGETS+= package +_REPLACE_TARGETS+= stage-package-create .endif _REPLACE_TARGETS+= replace-message _REPLACE_TARGETS+= unprivileged-install-hook |