From 129f8a3b10956da7524f444bb6e585ca8bcfd92b Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Mon, 16 Jun 2008 15:29:00 +0000
Subject: Fix DESTDIR.

---
 pkgtools/binpatch/Makefile |  6 +++---
 pkgtools/cdpack/Makefile   |  8 ++++----
 pkgtools/dfdisk/Makefile   | 11 +++++------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgtools/binpatch/Makefile b/pkgtools/binpatch/Makefile
index 98fb49090b9..50147ffa9ee 100644
--- a/pkgtools/binpatch/Makefile
+++ b/pkgtools/binpatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/06/12 02:14:42 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2008/06/16 15:29:00 joerg Exp $
 #
 
 DISTNAME=	binpatch-1.0
@@ -27,7 +27,7 @@ do-build:
 	  ${CC} -o binpatch binpatch.c )
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/binpatch ${PREFIX}/bin/binpatch
-	${INSTALL_MAN} ${WRKSRC}/binpatch.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/binpatch ${DESTDIR}${PREFIX}/bin/binpatch
+	${INSTALL_MAN} ${WRKSRC}/binpatch.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/cdpack/Makefile b/pkgtools/cdpack/Makefile
index 44d863de9fc..8b6976877c9 100644
--- a/pkgtools/cdpack/Makefile
+++ b/pkgtools/cdpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/06/12 02:14:42 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2008/06/16 15:29:35 joerg Exp $
 #
 
 DISTNAME=	cdpack-1.8
@@ -47,9 +47,9 @@ do-build:
 
 do-install:
 .for f in cdpack cddist
-	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${f}.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${f}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 .endfor
-	${INSTALL_SCRIPT} ${WRKSRC}/cdgen.awk ${PREFIX}/libexec
+	${INSTALL_SCRIPT} ${WRKSRC}/cdgen.awk ${DESTDIR}${PREFIX}/libexec
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/dfdisk/Makefile b/pkgtools/dfdisk/Makefile
index 6525fc9ef9c..685dc209957 100644
--- a/pkgtools/dfdisk/Makefile
+++ b/pkgtools/dfdisk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/06/12 02:14:42 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2008/06/16 15:30:42 joerg Exp $
 #
 
 DISTNAME=	dfdisk-1.0
@@ -27,7 +27,7 @@ FILES_SUBST+=	FTP="${ZOULARISBASE}/bin/ftp -p"
 FILES_SUBST+=	FTP="/usr/bin/ftp -p"
 .endif
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${EGDIR}
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	dfdisk.sh dfdisk.1 dfdisk.conf
@@ -45,9 +45,8 @@ post-extract:
 .endfor
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/dfdisk.sh ${PREFIX}/bin/dfdisk
-	${INSTALL_DATA} ${WRKDIR}/dfdisk.1 ${PREFIX}/${PKGMANDIR}/man1/dfdisk.1
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKDIR}/dfdisk.conf ${EGDIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/dfdisk.sh ${DESTDIR}${PREFIX}/bin/dfdisk
+	${INSTALL_DATA} ${WRKDIR}/dfdisk.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/dfdisk.1
+	${INSTALL_DATA} ${WRKDIR}/dfdisk.conf ${DESTDIR}${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3