diff options
| author | rillig <rillig@pkgsrc.org> | 2010-02-20 07:05:52 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2010-02-20 07:05:52 +0000 |
| commit | d0d79bee4881c5ff92279a2f00c85f8118a93678 (patch) | |
| tree | 3f22e808413d777c49c924ea1acce9c5fa37957e /mk | |
| parent | 92030a7399fe218b0032e8811bc5116d87bc9cd9 (diff) | |
| download | pkgsrc-d0d79bee4881c5ff92279a2f00c85f8118a93678.tar.gz | |
Handle MANINSTALL correctly for packages that USE_BSD_MAKEFILE.
Fixes PR 42714.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 3 | ||||
| -rw-r--r-- | mk/plist/plist-man.awk | 14 |
2 files changed, 11 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 7f43d2cd099..5cacb628153 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1960 2009/11/03 02:14:32 joerg Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1961 2010/02/20 07:05:52 rillig Exp $ # # This file is in the public domain. # @@ -218,6 +218,7 @@ BSD_MAKE_ENV+= INCSDIR=${PREFIX}/include BSD_MAKE_ENV+= LIBDIR=${PREFIX}/lib BSD_MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR} BSD_MAKE_ENV+= STRIPFLAG=${_STRIPFLAG_INSTALL:Q} +BSD_MAKE_ENV+= MANINSTALL=${MANINSTALL:Q} BSD_MAKE_ENV+= MKHTML=no _BUILD_DEFS= ${BUILD_DEFS} diff --git a/mk/plist/plist-man.awk b/mk/plist/plist-man.awk index 486b40d0c14..b30fc97f796 100644 --- a/mk/plist/plist-man.awk +++ b/mk/plist/plist-man.awk @@ -1,4 +1,4 @@ -# $NetBSD: plist-man.awk,v 1.7 2009/06/14 23:10:39 joerg Exp $ +# $NetBSD: plist-man.awk,v 1.8 2010/02/20 07:05:52 rillig Exp $ # # Copyright (c) 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -63,11 +63,15 @@ ### ### PKGMANDIR is the ${PREFIX}-relative path to the installed man pages. ### +function getenv(varname, defval) { + return varname in ENVIRON ? ENVIRON[varname] : defval; +} + BEGIN { - IMAKE_MANINSTALL = ENVIRON["IMAKE_MANINSTALL"] ? ENVIRON["IMAKE_MANINSTALL"] : "maninstall catinstall" - MANINSTALL = ENVIRON["MANINSTALL"] ? ENVIRON["MANINSTALL"] : "maninstall catinstall" - MANZ = ENVIRON["MANZ"] ? ENVIRON["MANZ"] : "no" - PKGMANDIR = ENVIRON["PKGMANDIR"] ? ENVIRON["PKGMANDIR"] : "man" + IMAKE_MANINSTALL = getenv("IMAKE_MANINSTALL", "maninstall catinstall") + MANINSTALL = getenv("MANINSTALL", "maninstall catinstall") + MANZ = getenv("MANZ", "no") + PKGMANDIR = getenv("PKGMANDIR", "man") } ### |