From 44f7dcbfb4e3153be7db0bb2b0d6914ddb96f8a7 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Thu, 6 Jul 2006 22:08:32 +0000
Subject: The "replace" target does conceptually the same thing as the
 "install" target in that it installs the currently-built software into the
 filesystem.  In that case where "replace" is specified as a target on the
 command line, make "replace" and not "install" be the source target for
 "package".

Also, place the "replace" target between the "install" and "package"
targets in _BARRIER_POST_TARGETS as it should be legal to do those
steps in that order (but not in another order).

These changes make the following work:

	make replace package

In this example, the currently installed package will be replaced and
the newly-installed software will be packaged, all within the same
make process.
---
 mk/bsd.pkg.barrier.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'mk/bsd.pkg.barrier.mk')

diff --git a/mk/bsd.pkg.barrier.mk b/mk/bsd.pkg.barrier.mk
index dfb4528c75d..54631f6645d 100644
--- a/mk/bsd.pkg.barrier.mk
+++ b/mk/bsd.pkg.barrier.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.barrier.mk,v 1.3 2006/07/06 15:43:10 jlam Exp $
+# $NetBSD: bsd.pkg.barrier.mk,v 1.4 2006/07/06 22:08:32 jlam Exp $
 
 _BARRIER_COOKIE=	${WRKDIR}/.barrier_cookie
 
@@ -19,12 +19,10 @@ _BARRIER_POST_TARGETS+=	test
 _BARRIER_POST_TARGETS+=	all
 _BARRIER_POST_TARGETS+=	install
 _BARRIER_POST_TARGETS+=	reinstall
+_BARRIER_POST_TARGETS+=	replace
 _BARRIER_POST_TARGETS+=	package
 _BARRIER_POST_TARGETS+=	repackage
 
-# XXX This target should probably be handled specially.
-_BARRIER_POST_TARGETS+=	replace
-
 .for _target_ in ${_BARRIER_POST_TARGETS}
 .  if make(${_target_})
 _BARRIER_CMDLINE_TARGETS+=	${_target_}
-- 
cgit v1.2.3