diff options
| author | sbd <sbd@pkgsrc.org> | 2013-01-05 07:32:49 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2013-01-05 07:32:49 +0000 |
| commit | bae4c2a4c08e50d478ee158cd54a4a91137a75de (patch) | |
| tree | eb290413150abf0fdaa43aa6239f7251de0d7a0f | |
| parent | 1b9ed266c03d7fdcccf76c87ebfe1c84f86b915c (diff) | |
| download | pkgsrc-bae4c2a4c08e50d478ee158cd54a4a91137a75de.tar.gz | |
Modify mk/plist/plist-gnu.mk to convert gnu/man to ${PKGGNUDIR}${PKGMANDIR}.
Also modify mk/install/install.mk to make the conversion when using
AUTO_MKDIRS.
| -rw-r--r-- | mk/install/install.mk | 3 | ||||
| -rw-r--r-- | mk/plist/plist-gnu.awk | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/mk/install/install.mk b/mk/install/install.mk index 1894657dc5a..c2899650c93 100644 --- a/mk/install/install.mk +++ b/mk/install/install.mk @@ -1,4 +1,4 @@ -# $NetBSD: install.mk,v 1.65 2012/12/06 11:36:31 jperkin Exp $ +# $NetBSD: install.mk,v 1.66 2013/01/05 07:32:49 sbd Exp $ # # This file provides the code for the "install" phase. # @@ -293,6 +293,7 @@ install-dirs-from-PLIST: ${CAT} ${PLIST_SRC} \ | sed -n \ -e 's,\\,\\\\,' \ + -e 's,^gnu/man/,${PKGGNUDIR}${PKGMANDIR}/,' \ -e 's,^gnu/,${PKGGNUDIR},' \ -e 's,^man/,${PKGMANDIR}/,' \ -e 's,^info/,${PKGINFODIR}/,' \ diff --git a/mk/plist/plist-gnu.awk b/mk/plist/plist-gnu.awk index 4613ec0f6e1..c4c31e5310b 100644 --- a/mk/plist/plist-gnu.awk +++ b/mk/plist/plist-gnu.awk @@ -1,4 +1,4 @@ -# $NetBSD: plist-gnu.awk,v 1.1 2012/12/06 11:36:31 jperkin Exp $ +# $NetBSD: plist-gnu.awk,v 1.2 2013/01/05 07:32:50 sbd Exp $ # # Copyright (c) 2012 The NetBSD Foundation, Inc. # All rights reserved. @@ -35,13 +35,22 @@ ### Certain environment variables must be set prior to running this script: ### ### PKGGNUDIR is the ${PREFIX}-relative path to the installed GNU files. +### PKGMANDIR is the ${PKGGNUDIR}-relative path to the install GNU manpages. ### BEGIN { # PKGGNUDIR is allowed to be empty so we do not provide a default. PKGGNUDIR = ENVIRON["PKGGNUDIR"] + PKGMANDIR = ENVIRON["PKGMANDIR"] ? ENVIRON["PKGMANDIR"] : "man" } ### +### Convert gnu/man to ${PKGGNUDIR}${PKGMANDIR} for all GNU manpages. +### +/^[^@]/ && \ +/^gnu\/man\// { + sub("^gnu/man", PKGGNUDIR PKGMANDIR) +} +### ### Convert gnu/ to ${PKGGNUDIR} for all GNU file entries. ### /^[^@]/ && \ |