diff options
| author | sbd <sbd@pkgsrc.org> | 2012-03-05 07:26:37 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2012-03-05 07:26:37 +0000 |
| commit | ec983db4d87d62aece89fc1dff90bb7b751eb3c6 (patch) | |
| tree | 44f33a596b9d56871edcf7b8384e4bb53754e34c /pkgtools/bootstrap-mk-files | |
| parent | b8640e6137159aa68ee1c9b122bbdaff4a44c12a (diff) | |
| download | pkgsrc-ec983db4d87d62aece89fc1dff90bb7b751eb3c6.tar.gz | |
Mirror two changes from the NetBSD mk-files.
1) Stop building catpages by default.
2) Derive MANINSTALL from MKCATPAGES.
Bump package version.
Diffstat (limited to 'pkgtools/bootstrap-mk-files')
| -rw-r--r-- | pkgtools/bootstrap-mk-files/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/bootstrap-mk-files/files/mods/bsd.own.mk.in | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/pkgtools/bootstrap-mk-files/Makefile b/pkgtools/bootstrap-mk-files/Makefile index 719ed3306c6..efd96bacc8d 100644 --- a/pkgtools/bootstrap-mk-files/Makefile +++ b/pkgtools/bootstrap-mk-files/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.29 2011/12/05 22:40:21 joerg Exp $ +# $NetBSD: Makefile,v 1.30 2012/03/05 07:26:37 sbd Exp $ -DISTNAME= bootstrap-mk-files-20111205 +DISTNAME= bootstrap-mk-files-20120305 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/bootstrap-mk-files/files/mods/bsd.own.mk.in b/pkgtools/bootstrap-mk-files/files/mods/bsd.own.mk.in index e0d7199843b..3d659a58907 100644 --- a/pkgtools/bootstrap-mk-files/files/mods/bsd.own.mk.in +++ b/pkgtools/bootstrap-mk-files/files/mods/bsd.own.mk.in @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk.in,v 1.3 2011/12/05 22:40:22 joerg Exp $ +# $NetBSD: bsd.own.mk.in,v 1.4 2012/03/05 07:26:37 sbd Exp $ .if !defined(_BSD_OWN_MK_) _BSD_OWN_MK_=1 @@ -31,7 +31,7 @@ MANDIR?= /usr/share/man MANGRP?= @ROOT_GROUP@ MANOWN?= @ROOT_USER@ MANMODE?= ${NONBINMODE} -MANINSTALL?= maninstall catinstall +MANINSTALL?= ${_MANINSTALL} INFODIR?= /usr/share/info INFOGRP?= @ROOT_GROUP@ @@ -219,7 +219,7 @@ PRINTOBJDIR= printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -B -s -f- # The NOxxx variables should only be used by Makefiles. # -MKCATPAGES?=yes +MKCATPAGES?=no .if defined(NODOC) MKDOC=no @@ -229,6 +229,11 @@ MKDOC=no MKDOC?=yes .endif +_MANINSTALL= maninstall +.if ${MKCATPAGES} != "no" +_MANINSTALL+= catinstall +.endif + MKINFO?=yes .if defined(NOLINKLIB) |