diff options
| author | jlam <jlam@pkgsrc.org> | 2017-08-19 00:24:13 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2017-08-19 00:24:13 +0000 |
| commit | da0bec3e7c39f86a4bde4080e9a1a885734ddce3 (patch) | |
| tree | b8f64ca56fc1d7d8e807db1b4d5eb960a589ffa2 /pkgtools | |
| parent | 4b8cebe29df12aeb5e85b8f820341b6e74eeb3e1 (diff) | |
| download | pkgsrc-da0bec3e7c39f86a4bde4080e9a1a885734ddce3.tar.gz | |
pkgtools/pkg: Install manpages into ${PKGMANDIR}.
Pass "mandir=..." when running "make install" to pass the correct
location for installed manpages under ${PKGMANDIR}.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg/Makefile | 5 | ||||
| -rw-r--r-- | pkgtools/pkg/distinfo | 3 | ||||
| -rw-r--r-- | pkgtools/pkg/patches/patch-docs_Makefile.am | 15 |
3 files changed, 5 insertions, 18 deletions
diff --git a/pkgtools/pkg/Makefile b/pkgtools/pkg/Makefile index 042da58c858..2c01ab3a9e8 100644 --- a/pkgtools/pkg/Makefile +++ b/pkgtools/pkg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2017/05/29 11:09:46 jperkin Exp $ +# $NetBSD: Makefile,v 1.21 2017/08/19 00:24:13 jlam Exp $ DISTNAME= pkg-1.9.99.4 PKGREVISION= 1 @@ -93,6 +93,9 @@ SUBST_FILES.vuxml= libpkg/pkg_audit.c SUBST_SED.vuxml= -e "s|https://vuxml.FreeBSD.org/freebsd|http://muscles.dragonflybsd.org/pkgsrc-vuxml/reports|" SUBST_MESSAGE.vuxml= Direct audit reports to Pkgsrc vuxml +# Install manpages under ${PKGMANDIR}. +INSTALL_MAKE_FLAGS+= mandir=${PREFIX:Q}/${PKGMANDIR:Q} + .if defined(PACKAGE_BUILDING) # set by Synth which has custom location, so use default path PKG.portsdir?= /usr/pkgsrc .else diff --git a/pkgtools/pkg/distinfo b/pkgtools/pkg/distinfo index df7ac9d912d..b369808a4fd 100644 --- a/pkgtools/pkg/distinfo +++ b/pkgtools/pkg/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.10 2016/11/21 14:04:35 marino Exp $ +$NetBSD: distinfo,v 1.11 2017/08/19 00:24:13 jlam Exp $ SHA1 (pkg-1.9.99.4.tar.xz) = e7f2f5c9481c6a4f5e05e08818ea8f114fc1bfcf RMD160 (pkg-1.9.99.4.tar.xz) = 320f9866503d028f4f54f466a9ebc86cc9378331 SHA512 (pkg-1.9.99.4.tar.xz) = eb4b01e26cffec6b6cd5604a81ba515eadcce09b4742876285bf8f510591c122665a1e598c100266f943439d0b2867b5a6e5702bc174ea302688bb73e0128d8b Size (pkg-1.9.99.4.tar.xz) = 1923452 bytes -SHA1 (patch-docs_Makefile.am) = aa6d5c9310c644d13d55c3176cd186c37cccc7c2 diff --git a/pkgtools/pkg/patches/patch-docs_Makefile.am b/pkgtools/pkg/patches/patch-docs_Makefile.am deleted file mode 100644 index 9cac7762c54..00000000000 --- a/pkgtools/pkg/patches/patch-docs_Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-docs_Makefile.am,v 1.1 2016/04/01 13:11:14 jperkin Exp $ - -Support PKGMANDIR. - ---- docs/Makefile.am.orig 2015-06-11 13:46:28.000000000 +0000 -+++ docs/Makefile.am -@@ -35,7 +35,7 @@ dist_man_MANS= pkg-add.8 \ - pkg_printf.3 \ - pkg_repos.3 - --mandir= $(prefix)/man -+mandir= $(prefix)/${PKGMANDIR} - - EXTRA_DIST= fix-xrefs - .PHONY: run-fix-xrefs |