From d88804096c2195f2f1dcbfb79e6e99f6656dcacb Mon Sep 17 00:00:00 2001
From: sbd <sbd@pkgsrc.org>
Date: Mon, 31 Dec 2012 00:27:36 +0000
Subject: Use ${PKGGNUDIR} and ${PKGMANDIR} in INSTALLATION_DIRS.

---
 devel/binutils/Makefile | 4 ++--
 devel/patch/Makefile    | 4 ++--
 lang/gawk/Makefile      | 4 ++--
 textproc/grep/Makefile  | 4 ++--
 textproc/gsed/Makefile  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 4b648892890..1347b9b5be3 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2012/12/06 11:40:57 jperkin Exp $
+# $NetBSD: Makefile,v 1.51 2012/12/31 00:27:36 sbd Exp $
 
 DISTNAME=	binutils-2.22
 PKGREVISION=	1
@@ -31,7 +31,7 @@ PLIST_SRC+=	${WRKDIR}/PLIST_DYNAMIC
 
 INFO_FILES=	yes
 
-INSTALLATION_DIRS=	gnu/bin gnu/man/man1
+INSTALLATION_DIRS=	${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1
 
 # gprof (XXX: and others?) cannot be built on all platforms
 #
diff --git a/devel/patch/Makefile b/devel/patch/Makefile
index 7093f233381..55edae24bd4 100644
--- a/devel/patch/Makefile
+++ b/devel/patch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2012/12/06 11:40:59 jperkin Exp $
+# $NetBSD: Makefile,v 1.37 2012/12/31 00:27:36 sbd Exp $
 
 DISTNAME=	patch-2.5.9
 PKGREVISION=	2
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+=	--program-prefix=g
 INSTALL_MAKE_FLAGS=	bindir=${DESTDIR}${PREFIX}/bin \
 			man1dir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
-INSTALLATION_DIRS=	gnu/bin gnu/man/man1
+INSTALLATION_DIRS=	${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1
 
 do-patch:
 	${MV} ${WRKSRC}/pch.c ${WRKSRC}/pch.c.orig
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index b5e99cfbaef..aede58443b8 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2012/12/06 11:42:05 jperkin Exp $
+# $NetBSD: Makefile,v 1.53 2012/12/31 00:27:36 sbd Exp $
 
 DISTNAME=	gawk-4.0.1
 PKGREVISION=	2
@@ -35,7 +35,7 @@ CPPFLAGS.OSF1+=		-D_OSF_SOURCE
 CFLAGS+=	-Dvm_region=vm_region_64
 .endif
 
-INSTALLATION_DIRS+=	gnu/bin gnu/man/man1
+INSTALLATION_DIRS+=	${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1
 
 post-install:
 	${LN} -s ${PREFIX}/bin/gawk ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/awk
diff --git a/textproc/grep/Makefile b/textproc/grep/Makefile
index c7b2fc72b6c..1ea3b21d9c4 100644
--- a/textproc/grep/Makefile
+++ b/textproc/grep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2012/12/18 12:08:25 tron Exp $
+# $NetBSD: Makefile,v 1.34 2012/12/31 00:27:37 sbd Exp $
 
 DISTNAME=	grep-2.14
 PKGREVISION=	1
@@ -20,7 +20,7 @@ CONFIGURE_ENV+=		MKDIR_P=${INSTALL_DATA_DIR:Q}
 INFO_FILES=		yes
 TEXINFO_REQD=		4.0
 
-INSTALLATION_DIRS=	gnu/bin gnu/man/man1
+INSTALLATION_DIRS=	${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile
index 1abf532fb6f..9d6926b2ab5 100644
--- a/textproc/gsed/Makefile
+++ b/textproc/gsed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2012/12/06 11:43:24 jperkin Exp $
+# $NetBSD: Makefile,v 1.43 2012/12/31 00:27:37 sbd Exp $
 #
 
 DISTNAME=	sed-4.2.1
@@ -19,7 +19,7 @@ GNU_CONFIGURE=		YES
 INFO_FILES=		YES
 TEST_TARGET=		check
 
-INSTALLATION_DIRS=	gnu/bin gnu/man/man1
+INSTALLATION_DIRS=	${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1
 
 # at least Solaris-2.9 has issues with grep/egrep
 USE_TOOLS+=		grep makeinfo
-- 
cgit v1.2.3