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 | |
| 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')
| -rw-r--r-- | pkgtools/pkg_install/Makefile | 7 | ||||
| -rw-r--r-- | pkgtools/pkg_install/PLIST | 32 |
2 files changed, 22 insertions, 17 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 diff --git a/pkgtools/pkg_install/PLIST b/pkgtools/pkg_install/PLIST index b15b6e87525..61bd507b4b4 100644 --- a/pkgtools/pkg_install/PLIST +++ b/pkgtools/pkg_install/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2003/09/01 16:27:09 jlam Exp $ +@comment $NetBSD: PLIST,v 1.5 2003/10/11 07:29:29 grant Exp $ sbin/linkfarm sbin/pkg_add sbin/pkg_admin @@ -6,18 +6,18 @@ sbin/pkg_create sbin/pkg_delete sbin/pkg_info sbin/pkg_view -share/man/cat1/linkfarm.0 -share/man/cat1/pkg_add.0 -share/man/cat1/pkg_admin.0 -share/man/cat1/pkg_create.0 -share/man/cat1/pkg_delete.0 -share/man/cat1/pkg_info.0 -share/man/cat1/pkg_view.0 -share/man/man1/linkfarm.1 -share/man/man1/pkg_add.1 -share/man/man1/pkg_admin.1 -share/man/man1/pkg_create.1 -share/man/man1/pkg_delete.1 -share/man/man1/pkg_info.1 -share/man/man1/pkg_view.1 -@exec [ -f ${PKG_DBDIR:-/var/db/pkg}/pkgdb.byfile.db ] || pkg_admin rebuild +${MANDIR}man/cat1/linkfarm.0 +${MANDIR}man/cat1/pkg_add.0 +${MANDIR}man/cat1/pkg_admin.0 +${MANDIR}man/cat1/pkg_create.0 +${MANDIR}man/cat1/pkg_delete.0 +${MANDIR}man/cat1/pkg_info.0 +${MANDIR}man/cat1/pkg_view.0 +${MANDIR}man/man1/linkfarm.1 +${MANDIR}man/man1/pkg_add.1 +${MANDIR}man/man1/pkg_admin.1 +${MANDIR}man/man1/pkg_create.1 +${MANDIR}man/man1/pkg_delete.1 +${MANDIR}man/man1/pkg_info.1 +${MANDIR}man/man1/pkg_view.1 +@exec [ -f ${PKG_DBDIR:-/var/db/pkg}/pkgdb.byfile.db ] || ${PKG_TOOLS_BIN}/pkg_admin rebuild |