From 6e63d13d492d4465bb128554ba011036edf4c9d0 Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Tue, 19 Dec 2006 13:28:20 +0000
Subject: Fixed PKGMANDIR.

---
 converters/base64/Makefile | 6 +++---
 pkgtools/shlock/Makefile   | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/converters/base64/Makefile b/converters/base64/Makefile
index 9c272545afb..c9c8307dcfe 100644
--- a/converters/base64/Makefile
+++ b/converters/base64/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:29:06 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/12/19 13:34:56 rillig Exp $
 #
 
 DISTNAME=	base64-1.3
@@ -15,10 +15,10 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 GNU_CONFIGURE=	yes
 BUILD_TARGET=	prog
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/base64 ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/base64.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/base64.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/shlock/Makefile b/pkgtools/shlock/Makefile
index f01dc17d062..8614724d62d 100644
--- a/pkgtools/shlock/Makefile
+++ b/pkgtools/shlock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/12/07 19:10:21 rpaulo Exp $
+# $NetBSD: Makefile,v 1.18 2006/12/19 13:28:20 rillig Exp $
 #
 
 DISTNAME=	shlock-20020114
@@ -17,9 +17,7 @@ MANCOMPRESSED_IF_MANZ=	yes
 PLIST_SRC=	${WRKDIR}/PLIST
 BUILD_DEFS+=	MANINSTALL
 
-MAKE_ENV+=	BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man
-MAKE_ENV+=	BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q}
-MAKE_ENV+=	MANOWN=${BINOWN:Q} MANGRP=${BINGRP:Q}
+MAKE_ENV+=	${BSD_MAKE_ENV}
 
 .include "../../mk/bsd.prefs.mk"
 
-- 
cgit v1.2.3