diff options
| author | rillig <rillig> | 2005-11-13 17:40:00 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2005-11-13 17:40:00 +0000 |
| commit | 4d30d347bfff19d070b2285a649857e8cd1e8edc (patch) | |
| tree | 9751991e67b29676d791103ef4eb8453dc290adf /mk | |
| parent | 6ea48736541bd36b40090f68463ba1251f22a185 (diff) | |
| download | pkgsrc-4d30d347bfff19d070b2285a649857e8cd1e8edc.tar.gz | |
Reverted the change that moved the definition of MANINSTALL from mk.conf to
bsd.prefs.mk. Alistair has told me that Stoned had told him that MANINSTALL
actually belongs to mk.conf.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 7 | ||||
| -rw-r--r-- | mk/defaults/mk.conf | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 0bb2d5d6835..489698593ea 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.207 2005/11/10 09:55:21 rillig Exp $ +# $NetBSD: bsd.prefs.mk,v 1.208 2005/11/13 17:40:00 rillig Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -607,9 +607,4 @@ PREPEND_PATH+= ${USE_X11:D${X11BASE}/bin} ${LOCALBASE}/bin USE_TOOLS+= awk:pkgsrc cut:pkgsrc echo:pkgsrc pwd:pkgsrc \ sed:pkgsrc tr:pkgsrc uname:pkgsrc -MANINSTALL?= maninstall catinstall -# Specify manpage installation types. -# Possible: maninstall, catinstall, both types or empty -# Default: maninstall catinstall - .endif # BSD_PKG_MK diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index aa33d3dd572..4df5528e4ce 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.88 2005/11/10 10:37:47 rillig Exp $ +# $NetBSD: mk.conf,v 1.89 2005/11/13 17:40:00 rillig Exp $ # # This file provides default values for variables that may be overridden @@ -20,6 +20,11 @@ # Possible: defined, not defined # Default: not defined +MANINSTALL?= maninstall catinstall +# Specify manpage installation types. +# Possible: maninstall, catinstall, both types or empty +# Default: maninstall catinstall + #MANZ= # gzip manual pages at installation time # Possible: defined, not defined |