Add PKGGNUDIR support.

17 files changed, 71 insertions, 56 deletions

diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile
index 1153fa1fc16..b37b47a7b7b 100644
--- a/archivers/gcpio/Makefile
+++ b/archivers/gcpio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2012/11/20 17:07:05 jperkin Exp $
+# $NetBSD: Makefile,v 1.45 2012/12/06 11:38:19 jperkin Exp $
 #
 
 DISTNAME=	cpio-2.6
@@ -37,10 +37,12 @@ PLIST_VARS+=	rmt
 PLIST.rmt=	yes
 .endif
 
+.include "../../mk/bsd.prefs.mk"
+
 post-install:
-	${LN} -sf ${PREFIX}/bin/gcpio ${DESTDIR}${PREFIX}/gnu/bin/cpio
-	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/gcpio.1 ${DESTDIR}${PREFIX}/gnu/man/man1/cpio.1
-	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/gmt.1 ${DESTDIR}${PREFIX}/gnu/man/man1/mt.1
+	${LN} -sf ${PREFIX}/bin/gcpio ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/cpio
+	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/gcpio.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/cpio.1
+	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/gmt.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/mt.1
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/gsharutils/Makefile b/archivers/gsharutils/Makefile
index 622104f7dac..b4d7a7ce5da 100644
--- a/archivers/gsharutils/Makefile
+++ b/archivers/gsharutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2012/09/11 19:46:55 asau Exp $
+# $NetBSD: Makefile,v 1.49 2012/12/06 11:38:19 jperkin Exp $
 
 DISTNAME=	sharutils-4.11.1
 PKGREVISION=	2
@@ -27,10 +27,12 @@ CONFIGURE_ENV+=		SH=${TOOLS_SH}
 
 CONFIGURE_ARGS+=	--program-prefix=g
 
+.include "../../mk/bsd.prefs.mk"
+
 post-install:
 .for f in shar unshar
-	${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/gnu/bin/${f}
-	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 ${DESTDIR}${PREFIX}/gnu/man/man1/${f}.1
+	${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/${f}
+	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/${f}.1
 .endfor
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile
index e63ba26c2fe..3dbb936cc5c 100644
--- a/archivers/gtar-base/Makefile
+++ b/archivers/gtar-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2012/09/11 19:46:55 asau Exp $
+# $NetBSD: Makefile,v 1.77 2012/12/06 11:38:19 jperkin Exp $
 
 DISTNAME=	tar-1.26
 PKGNAME=	${DISTNAME:S/tar/gtar-base/}
@@ -47,9 +47,9 @@ PLIST.rmt=		yes
 CONFIGURE_ENV+=		gt_cv_func_gnugettext3_libintl=yes
 .endif
 
-SYMLINKS		= bin/gtar gnu/bin/tar \
-			man/man1/gtar.1 gnu/man/man1/tar.1 \
-			libexec/grmt gnu/libexec/rmt
+SYMLINKS		= bin/gtar ${PKGGNUDIR}bin/tar \
+			man/man1/gtar.1 ${PKGGNUDIR}${PKGMANDIR}/man1/tar.1 \
+			libexec/grmt ${PKGGNUDIR}libexec/rmt
 
 post-install:
 	${INSTALL_MAN} ${FILESDIR}/gtar.1 \
diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 9232fe2302a..4b648892890 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2012/11/21 07:46:40 jperkin Exp $
+# $NetBSD: Makefile,v 1.50 2012/12/06 11:40:57 jperkin Exp $
 
 DISTNAME=	binutils-2.22
 PKGREVISION=	1
@@ -84,11 +84,11 @@ post-install:
 .for f in ${SYMLINK_FILES}
 	set -e; \
 	if [ -f ${DESTDIR}${PREFIX}/bin/g${f:Q} ]; then \
-	    ${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/gnu/bin/${f}; \
+	    ${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/${f}; \
 	fi
 	if [ -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/g${f:Q}.1 ]; then \
 	    ${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 \
-	              ${DESTDIR}${PREFIX}/gnu/man/man1/${f}.1; \
+	              ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/${f}.1; \
 	fi
 .endfor
 
diff --git a/devel/diffutils/Makefile b/devel/diffutils/Makefile
index 16746b5e521..888331b6e53 100644
--- a/devel/diffutils/Makefile
+++ b/devel/diffutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2012/10/31 11:16:53 asau Exp $
+# $NetBSD: Makefile,v 1.30 2012/12/06 11:40:58 jperkin Exp $
 #
 
 DISTNAME=		diffutils-3.2
@@ -28,8 +28,8 @@ AUTO_MKDIRS=		yes
 
 post-install:
 .for f in cmp diff diff3 sdiff
-	${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/gnu/bin/${f}
-	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 ${DESTDIR}${PREFIX}/gnu/man/man1/${f}.1
+	${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/${f}
+	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/${f}.1
 .endfor
 
 CONFIGURE_ARGS+=	--program-prefix=g
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index ee7f14c5186..a3b4ec2689f 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2012/10/31 11:17:00 asau Exp $
+# $NetBSD: Makefile,v 1.52 2012/12/06 11:40:58 jperkin Exp $
 #
 
 DISTNAME=	indent-2.2.9
@@ -22,10 +22,12 @@ MAKE_JOBS_SAFE=		no
 
 AUTO_MKDIRS=		yes
 
+.include "../../mk/bsd.prefs.mk"
+
 post-install:
-	${LN} -sf ${PREFIX}/bin/gindent ${DESTDIR}${PREFIX}/gnu/bin/indent
-	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/gindent.1 ${DESTDIR}${PREFIX}/gnu/man/man1/indent.1
-	${LN} -sf ${PREFIX}/bin/gtexinfo2man ${DESTDIR}${PREFIX}/gnu/bin/texinfo2man
+	${LN} -sf ${PREFIX}/bin/gindent ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/indent
+	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/gindent.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/indent.1
+	${LN} -sf ${PREFIX}/bin/gtexinfo2man ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/texinfo2man
 
 CONFIGURE_ARGS+=	--program-prefix=g
 
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 1814303a2d4..56b1dbe86e6 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2012/10/31 11:17:01 asau Exp $
+# $NetBSD: Makefile,v 1.84 2012/12/06 11:40:59 jperkin Exp $
 
 DISTNAME=	make-3.82
 PKGNAME=	g${DISTNAME}
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	ac_cv_func_strndup=no
 post-install:
 	${CHMOD} g-s ${DESTDIR}${PREFIX}/bin/gmake
 	${CHGRP} ${BINGRP} ${DESTDIR}${PREFIX}/bin/gmake
-	${LN} -sf ${PREFIX}/bin/gmake ${DESTDIR}${PREFIX}/gnu/bin/make
-	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/gmake.1 ${DESTDIR}${PREFIX}/gnu/man/man1/make.1
+	${LN} -sf ${PREFIX}/bin/gmake ${DESTDIR}${PREFIX}/${PKGGNUDIR}/bin/make
+	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/gmake.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/make.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index cb3f1929ca1..18e75871843 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2012/10/31 11:17:27 asau Exp $
+# $NetBSD: Makefile,v 1.70 2012/12/06 11:40:59 jperkin Exp $
 
 DISTNAME=	m4-1.4.16
 PKGREVISION=	3
@@ -29,7 +29,7 @@ AUTO_MKDIRS=		yes
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/*.m4 ${DESTDIR}${PREFIX}/share/examples/m4
-	${LN} -sf ${PREFIX}/bin/gm4 ${DESTDIR}${PREFIX}/gnu/bin/m4
-	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/gm4.1 ${DESTDIR}${PREFIX}/gnu/man/man1/m4.1
+	${LN} -sf ${PREFIX}/bin/gm4 ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/m4
+	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/gm4.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/m4.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/patch/Makefile b/devel/patch/Makefile
index 01009475236..7093f233381 100644
--- a/devel/patch/Makefile
+++ b/devel/patch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2012/10/31 11:19:22 asau Exp $
+# $NetBSD: Makefile,v 1.36 2012/12/06 11:40:59 jperkin Exp $
 
 DISTNAME=	patch-2.5.9
 PKGREVISION=	2
@@ -39,8 +39,8 @@ do-patch:
 		< ${WRKSRC}/pch.c.orig 					\
 		> ${WRKSRC}/pch.c
 
-SYMLINKS	= bin/gpatch gnu/bin/patch \
-		man/man1/gpatch.1 gnu/man/man1/patch.1
+SYMLINKS	= bin/gpatch ${PKGGNUDIR}bin/patch \
+		man/man1/gpatch.1 ${PKGGNUDIR}${PKGMANDIR}/man1/patch.1
 post-install:
 .for o n in ${SYMLINKS}
 	${LN} -sf ${PREFIX}/${o} ${DESTDIR}${PREFIX}/${n}
diff --git a/editors/ed/Makefile b/editors/ed/Makefile
index f9dc97e72b0..cd8e5a6843a 100644
--- a/editors/ed/Makefile
+++ b/editors/ed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/10/03 11:43:32 asau Exp $
+# $NetBSD: Makefile,v 1.16 2012/12/06 11:41:19 jperkin Exp $
 
 DISTNAME=		ed-1.1
 PKGREVISION=		2
@@ -21,10 +21,12 @@ INSTALL_TARGET=		install install-man
 
 AUTO_MKDIRS=		yes
 
+.include "../../mk/bsd.prefs.mk"
+
 post-install:
 .for f in ed red
-	${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/gnu/bin/${f}
-	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 ${DESTDIR}${PREFIX}/gnu/man/man1/${f}.1
+	${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/${f}
+	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/${f}.1
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index 3b5eb7f2d29..b5e99cfbaef 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2012/10/02 20:11:40 asau Exp $
+# $NetBSD: Makefile,v 1.52 2012/12/06 11:42:05 jperkin Exp $
 
 DISTNAME=	gawk-4.0.1
 PKGREVISION=	2
@@ -38,8 +38,8 @@ CFLAGS+=	-Dvm_region=vm_region_64
 INSTALLATION_DIRS+=	gnu/bin gnu/man/man1
 
 post-install:
-	${LN} -s ../../bin/gawk ${DESTDIR}${PREFIX}/gnu/bin/awk
-	${LN} -s ../../../man/man1/gawk.1 ${DESTDIR}${PREFIX}/gnu/man/man1/awk.1
+	${LN} -s ${PREFIX}/bin/gawk ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/awk
+	${LN} -s ${PREFIX}/${PKGMANDIR}/man1/gawk.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/awk.1
 
 BUILDLINK_API_DEPENDS.gettext+=	gettext-lib>=0.10.36
 
diff --git a/math/units/Makefile b/math/units/Makefile
index 99f506f26c3..88c8d7c522b 100644
--- a/math/units/Makefile
+++ b/math/units/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/10/27 11:50:42 wen Exp $
+# $NetBSD: Makefile,v 1.8 2012/12/06 11:42:20 jperkin Exp $
 
 DISTNAME=	units-2.01
 CATEGORIES=	math
@@ -20,8 +20,7 @@ INSTALLATION_DIRS=	gnu/bin
 REPLACE_PYTHON=	units_cur
 
 post-install:
-	set -e; cd ${DESTDIR}${PREFIX}/gnu/bin; \
-	ln -s ../../bin/gunits units
+	${LN} -sf ${PREFIX}/bin/gunits ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/units
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index 406b93089df..9e593f35927 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2012/10/03 21:57:36 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2012/12/06 11:43:03 jperkin Exp $
 
 .include "../../sysutils/coreutils/Makefile.common"
 
@@ -46,10 +46,10 @@ post-install:
 .for f in ${PROGS}
 	set -e; \
 	if ${TEST} -f ${DESTDIR}${PREFIX}/bin/g${f:Q}; then \
-	  ${LN} -sf ${PREFIX}/bin/g${f:Q} ${DESTDIR}${PREFIX}/gnu/bin/${f:Q}; \
+	  ${LN} -sf ${PREFIX}/bin/g${f:Q} ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/${f:Q}; \
 	fi; \
 	if ${TEST} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/g${f:Q}.1; then \
-	  ${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f:Q}.1 ${DESTDIR}${PREFIX}/gnu/man/man1/${f:Q}.1; \
+	  ${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f:Q}.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/${f:Q}.1; \
 	fi
 .endfor
 
diff --git a/sysutils/findutils/Makefile b/sysutils/findutils/Makefile
index c76b92c728e..de466b9b876 100644
--- a/sysutils/findutils/Makefile
+++ b/sysutils/findutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2012/10/23 19:51:01 asau Exp $
+# $NetBSD: Makefile,v 1.32 2012/12/06 11:43:03 jperkin Exp $
 
 DISTNAME=	findutils-4.2.33
 PKGREVISION=	3
@@ -20,12 +20,14 @@ CONFIGURE_ARGS+=	--program-prefix=g
 
 AUTO_MKDIRS=		yes
 
+.include "../../mk/bsd.prefs.mk"
+
 post-install:
 .for f in find locate updatedb xargs
-	${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/gnu/bin/${f}
-	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 ${DESTDIR}${PREFIX}/gnu/man/man1/${f}.1
+	${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/${f}
+	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/${f}.1
 .endfor
-	${LN} -sf ${PREFIX}/${PKGMANDIR}/man5/glocatedb.5 ${DESTDIR}${PREFIX}/gnu/man/man5/locatedb.5
+	${LN} -sf ${PREFIX}/${PKGMANDIR}/man5/glocatedb.5 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man5/locatedb.5
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/grep/Makefile b/textproc/grep/Makefile
index 14ed0f16b59..8240ff48c4b 100644
--- a/textproc/grep/Makefile
+++ b/textproc/grep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2012/10/25 06:55:51 asau Exp $
+# $NetBSD: Makefile,v 1.32 2012/12/06 11:43:24 jperkin Exp $
 
 DISTNAME=	grep-2.14
 PKGREVISION=	1
@@ -22,12 +22,14 @@ TEXINFO_REQD=		4.0
 
 INSTALLATION_DIRS=	gnu/bin gnu/man/man1
 
+.include "../../mk/bsd.prefs.mk"
+
 post-install:
-.for g n in  bin/ggrep gnu/bin/grep   bin/gegrep gnu/bin/egrep \
-             bin/gfgrep gnu/bin/fgrep   \
-             man/man1/ggrep.1 gnu/man/man1/grep.1 \
-             man/man1/ggrep.1 gnu/man/man1/egrep.1 \
-             man/man1/ggrep.1 gnu/man/man1/fgrep.1
+.for g n in  bin/ggrep ${PKGGNUDIR}bin/grep bin/gegrep ${PKGGNUDIR}bin/egrep \
+             bin/gfgrep ${PKGGNUDIR}bin/fgrep   \
+             man/man1/ggrep.1 ${PKGGNUDIR}${PKGMANDIR}/man1/grep.1 \
+             man/man1/ggrep.1 ${PKGGNUDIR}${PKGMANDIR}/man1/egrep.1 \
+             man/man1/ggrep.1 ${PKGGNUDIR}${PKGMANDIR}/man1/fgrep.1
 	${LN} -sf ${PREFIX}/${g} ${DESTDIR}${PREFIX}/${n}
 .endfor
 
diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile
index 076571a800d..1abf532fb6f 100644
--- a/textproc/gsed/Makefile
+++ b/textproc/gsed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2012/10/25 06:55:52 asau Exp $
+# $NetBSD: Makefile,v 1.42 2012/12/06 11:43:24 jperkin Exp $
 #
 
 DISTNAME=	sed-4.2.1
@@ -26,8 +26,10 @@ USE_TOOLS+=		grep makeinfo
 
 CONFIGURE_ARGS+=	--program-prefix=g
 
+.include "../../mk/bsd.prefs.mk"
+
 post-install:
-.for g n in bin/gsed gnu/bin/sed man/man1/gsed.1 gnu/man/man1/sed.1
+.for g n in bin/gsed ${PKGGNUDIR}bin/sed ${PKGMANDIR}/man1/gsed.1 ${PKGGNUDIR}${PKGMANDIR}/man1/sed.1
 	${LN} -sf ${PREFIX}/${g} ${DESTDIR}${PREFIX}/${n}
 .endfor
 
diff --git a/time/gnutime/Makefile b/time/gnutime/Makefile
index de056e67192..0b284e4e9c1 100644
--- a/time/gnutime/Makefile
+++ b/time/gnutime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/10/08 13:04:18 asau Exp $
+# $NetBSD: Makefile,v 1.10 2012/12/06 11:43:52 jperkin Exp $
 #
 
 DISTNAME=		time-1.7
@@ -18,7 +18,9 @@ INFO_FILES=		yes
 CONFIGURE_ARGS+=	--program-prefix=g
 INSTALLATION_DIRS=	gnu/bin
 
+.include "../../mk/bsd.prefs.mk"
+
 post-install:
-	ln -f -s ../../bin/gtime ${DESTDIR}${PREFIX}/gnu/bin/time
+	${LN} -fs ${PREFIX}/bin/gtime ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/time
 
 .include "../../mk/bsd.pkg.mk"