diff options
| author | reed <reed@pkgsrc.org> | 2005-12-27 17:34:53 +0000 |
|---|---|---|
| committer | reed <reed@pkgsrc.org> | 2005-12-27 17:34:53 +0000 |
| commit | 45d9dae9940a0e9613eb698f1b4e9949ff26ec8d (patch) | |
| tree | 0cd67e01d4b167aa88f8c9f0805b71812f0d49f7 | |
| parent | 172c057f5a09e68812fa3e9e53e05cb199164dbe (diff) | |
| download | pkgsrc-45d9dae9940a0e9613eb698f1b4e9949ff26ec8d.tar.gz | |
Honor PKGMANDIR.
| -rw-r--r-- | graphics/png/Makefile | 10 | ||||
| -rw-r--r-- | pkgtools/verifypc/Makefile | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/graphics/png/Makefile b/graphics/png/Makefile index 356fec2b010..f4796c7f161 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.72 2005/12/05 20:50:22 rillig Exp $ +# $NetBSD: Makefile,v 1.73 2005/12/27 17:34:53 reed Exp $ # On update, don't forget to increase shared library major/minor's in # accordance with changes (patch-aa). @@ -29,7 +29,7 @@ MAKE_ENV+= REALCC=${CC:Q} MAKE_ENV+= LIBPNG_SO_MAJOR=${LIBPNG_SO_MAJOR:Q} MAKE_ENV+= LIBPNG_SO_MINOR=${LIBPNG_SO_MINOR:Q} -INSTALLATION_DIRS= include lib/pkgconfig man/man3 man/man5 +INSTALLATION_DIRS= include lib/pkgconfig ${PKGMANDIR}/man3 ${PKGMANDIR}/man5 PKGCONFIG_OVERRIDE= scripts/libpng.pc.in @@ -40,9 +40,9 @@ SUBST_SED.pc= -e 's,@PREFIX@,${PREFIX},' SUBST_MESSAGE.pc= "Fixing libpng.pc.in." post-install: - ${INSTALL_MAN} ${WRKSRC}/libpng.3 ${PREFIX}/man/man3 - ${INSTALL_MAN} ${WRKSRC}/libpngpf.3 ${PREFIX}/man/man3 - ${INSTALL_MAN} ${WRKSRC}/png.5 ${PREFIX}/man/man5 + ${INSTALL_MAN} ${WRKSRC}/libpng.3 ${PREFIX}/${PKGMANDIR}/man3 + ${INSTALL_MAN} ${WRKSRC}/libpngpf.3 ${PREFIX}/${PKGMANDIR}/man3 + ${INSTALL_MAN} ${WRKSRC}/png.5 ${PREFIX}/${PKGMANDIR}/man5 ${INSTALL_DATA} ${WRKSRC}/scripts/libpng.pc.in \ ${PREFIX}/lib/pkgconfig/libpng12.pc diff --git a/pkgtools/verifypc/Makefile b/pkgtools/verifypc/Makefile index d55ea6e43e9..24b5141bcda 100644 --- a/pkgtools/verifypc/Makefile +++ b/pkgtools/verifypc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/10/09 10:30:23 jmmv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/27 17:36:41 reed Exp $ # DISTNAME= verifypc-1.3 @@ -23,7 +23,7 @@ SUBST_FILES.vars= * SUBST_SED.vars= -e 's|@MAKE@|${MAKE}|g' SUBST_SED.vars+= -e 's|@SH@|${SH}|g' -INSTALLATION_DIRS= man/man1 bin +INSTALLATION_DIRS= ${PKGMANDIR}/man1 bin do-extract: ${CP} ${FILESDIR}/verifypc.sh ${WRKSRC} @@ -32,6 +32,6 @@ do-extract: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/verifypc.sh \ ${PREFIX}/bin/verifypc - ${INSTALL_MAN} ${WRKSRC}/verifypc.1 ${PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/verifypc.1 ${PREFIX}/${PKGMANDIR}/man1/ .include "../../mk/bsd.pkg.mk" |