diff options
| author | jlam <jlam> | 2003-08-14 07:08:16 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-08-14 07:08:16 +0000 |
| commit | 2df3d382c1294f4cf33bd7392482816b30644566 (patch) | |
| tree | b20fb46485bbf2c2cf2a63d21029e7efa09dccc6 | |
| parent | 7800ceeb7bb2466f0aeb15de2796bb87aad7cfea (diff) | |
| download | pkgsrc-2df3d382c1294f4cf33bd7392482816b30644566.tar.gz | |
Move the PKG_INSTALLATION_TYPE definition from bsd.pkg.defaults.mk to
bsd.prefs.mk. We don't want users to get the idea that this variable is
something that they set in /etc/mk.conf.
| -rw-r--r-- | mk/bsd.pkg.defaults.mk | 7 | ||||
| -rw-r--r-- | mk/bsd.prefs.mk | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk index b17ae7b780d..2db8c83c3b2 100644 --- a/mk/bsd.pkg.defaults.mk +++ b/mk/bsd.pkg.defaults.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.defaults.mk,v 1.160.2.4 2003/08/01 19:00:26 jlam Exp $ +# $NetBSD: bsd.pkg.defaults.mk,v 1.160.2.5 2003/08/14 07:08:16 jlam Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -55,11 +55,6 @@ PKGSRC_SLEEPSECS?= 5 # Possible: a positive integer # Default: 5 -PKG_INSTALLATION_TYPE?= overwrite -# The type of installations that are currently done. -# Possible: overwrite, pkgviews -# Default: overwrite - #USETBL= # Run raw manual pages through tbl(1) before piping through troff(1) # when formatting manual pages. diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index e6551dc903a..ca2509853c1 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.118.2.4 2003/07/29 20:34:19 jlam Exp $ +# $NetBSD: bsd.prefs.mk,v 1.118.2.5 2003/08/14 07:08:17 jlam Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -357,4 +357,9 @@ _COMPILER_LD_FLAG= # pattern for Sun compilers _COMPILER_LD_FLAG= -Wl, # pattern for GCC and others .endif +# The style of installation to be performed for the package. +# Possible: overwrite, pkgviews +# +PKG_INSTALLATION_TYPE?= overwrite + .endif # BSD_PKG_MK |