diff options
| author | grant <grant> | 2003-10-11 07:29:29 +0000 |
|---|---|---|
| committer | grant <grant> | 2003-10-11 07:29:29 +0000 |
| commit | 1f480459946c5e38df2e2708c52e70a18f1f73f4 (patch) | |
| tree | 3f3982f3ddd8cda726233ca9552da033452d1654 /pkgtools/pkg_install/Makefile | |
| parent | fd7c3acd2f9bc5a267021e9e8507eba1f1b0bf59 (diff) | |
| download | pkgsrc-1f480459946c5e38df2e2708c52e70a18f1f73f4.tar.gz | |
ensure pkg_admin is called with the full path and use the right
directory for man pages in the PLIST.
fixes remaining part of PR pkg/21858 from Jeremy C. Reed.
Diffstat (limited to 'pkgtools/pkg_install/Makefile')
| -rw-r--r-- | pkgtools/pkg_install/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index 84df735f770..b239f0fbead 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.88 2003/09/25 12:43:36 grant Exp $ +# $NetBSD: Makefile,v 1.89 2003/10/11 07:29:29 grant Exp $ # Notes to package maintainers: # @@ -33,6 +33,9 @@ NO_PACKAGE= Deinstallation is not permitted NO_TOOLS= # defined PKG_PRESERVE= # defined +PLIST_SUBST+= MANDIR=${MANDIR} +PLIST_SUBST+= PKG_TOOLS_BIN=${PKG_TOOLS_BIN} + LIBNBCOMPAT_FILESDIR= ${.CURDIR}/../../pkgtools/libnbcompat/files LIBNBCOMPAT_SRCDIR= ${WRKDIR}/libnbcompat @@ -69,6 +72,8 @@ post-install: PREFIX:= ${PKG_TOOLS_BIN:C|/[^/]?bin$||} .if ${PREFIX} == "/usr" CONFIGURE_ARGS+= --mandir=${PREFIX}/share/man +MANDIR= share/ .else CONFIGURE_ARGS+= --mandir=${PREFIX}/man +MANDIR= # empty .endif |