diff options
| author | spz <spz@pkgsrc.org> | 2012-03-11 10:44:42 +0000 |
|---|---|---|
| committer | spz <spz@pkgsrc.org> | 2012-03-11 10:44:42 +0000 |
| commit | d92bcbaf5f463a66ba2fca5c32511cf2c87aa2bb (patch) | |
| tree | 3a262727f3c3e24613df8c5609365b59b69db5a0 | |
| parent | 5649b8140b2311c6ea8388f08960198e5e14c312 (diff) | |
| download | pkgsrc-d92bcbaf5f463a66ba2fca5c32511cf2c87aa2bb.tar.gz | |
Pullup ticket #3697 - requested by tron
mk/plist: fix for handling of man pages
Revisions pulled up:
- mk/plist/plist.mk 1.41
-------------------------------------------------------------------
Module Name: pkgsrc
Committed By: tron
Date: Sun Mar 4 08:03:56 UTC 2012
Modified Files:
pkgsrc/mk/plist: plist.mk
Log Message:
Don't strip out "cat" manual pages if the package gets built via "imake".
The settings in "MANINSTALL" don't apply here.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/mk/plist/plist.mk
| -rw-r--r-- | mk/plist/plist.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mk/plist/plist.mk b/mk/plist/plist.mk index 2d3a71e16d6..78395b63af3 100644 --- a/mk/plist/plist.mk +++ b/mk/plist/plist.mk @@ -1,4 +1,4 @@ -# $NetBSD: plist.mk,v 1.40 2011/09/08 20:17:16 abs Exp $ +# $NetBSD: plist.mk,v 1.40.4.1 2012/03/11 10:44:42 spz Exp $ # # This Makefile fragment handles the creation of PLISTs for use by # pkg_create(8). @@ -96,8 +96,10 @@ _PLIST_NOKEYWORDS=${PLIST}_nokeywords .if (defined(USE_IMAKE) || !empty(USE_TOOLS:Mimake)) _IMAKE_MANINSTALL= ${IMAKE_MANINSTALL} +_PLIST_MANINSTALL= ${IMAKE_MANINSTALL} .else _IMAKE_MANINSTALL= # empty +_PLIST_MANINSTALL= ${MANINSTALL} .endif _LIBTOOL_EXPAND= \ @@ -126,7 +128,7 @@ _PLIST_AWK_ENV+= IGNORE_LIBTOOLIZE=${IGNORE_LIBTOOLIZE:Q} _PLIST_AWK_ENV+= LIBTOOLIZE_PLIST=${LIBTOOLIZE_PLIST:Q} _PLIST_AWK_ENV+= LIBTOOL_EXPAND=${_LIBTOOL_EXPAND:Q} _PLIST_AWK_ENV+= LS=${TOOLS_LS:Q} -_PLIST_AWK_ENV+= MANINSTALL=${MANINSTALL:Q} +_PLIST_AWK_ENV+= MANINSTALL=${_PLIST_MANINSTALL:Q} _PLIST_AWK_ENV+= MANZ=${_MANZ:Q} _PLIST_AWK_ENV+= PKGMANDIR=${PKGMANDIR:Q} _PLIST_AWK_ENV+= PREFIX=${DESTDIR:Q}${PREFIX:Q} |