diff options
| author | jlam <jlam> | 2006-06-05 17:21:54 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-06-05 17:21:54 +0000 |
| commit | 3cf6ca0a74d734abec3ff6d980ae831fa97cd582 (patch) | |
| tree | 3cfc4837c05b7069180938908a35d1e34ab54109 /mk/bsd.pkg.mk | |
| parent | 61df9ab4da892f3e8966097f61203092dce326b3 (diff) | |
| download | pkgsrc-3cf6ca0a74d734abec3ff6d980ae831fa97cd582.tar.gz | |
Move definitions for UPDATE_TARGET and DEPENDS_TARGET closer to where
they are used. Also, move UPDATE_RUNNING into the install module where
it is used, and make it "private" by prepending with an underscore.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 43b7b270191..059791718b5 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1836 2006/06/05 02:22:49 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1837 2006/06/05 17:21:54 jlam Exp $ # # This file is in the public domain. # @@ -761,36 +761,6 @@ BUILD_DEFS+= OSVERSION_SPECIFIC all: ${_PKGSRC_BUILD_TARGETS} .endif -.if !defined(DEPENDS_TARGET) -. if make(package) -DEPENDS_TARGET= package -. elif make(update) -. if defined(UPDATE_TARGET) && ${UPDATE_TARGET} == "replace" -DEPENDS_TARGET= ${UPDATE_TARGET} -. else -DEPENDS_TARGET= update -. endif -. elif make(bin-install) || make(real-su-bin-install) -DEPENDS_TARGET= bin-install -. else -DEPENDS_TARGET= reinstall -. endif -.endif - -.if !defined(UPDATE_TARGET) -. if ${DEPENDS_TARGET} == "update" -. if make(package) -UPDATE_TARGET= package -. else -UPDATE_TARGET= install -. endif -. else -UPDATE_TARGET= ${DEPENDS_TARGET} -. endif -.endif - -UPDATE_RUNNING?= NO - ################################################################ # The following are used to create easy dummy targets for # disabling some bit of default target behavior you don't want. |