From 1b5538a51a22e1175099fe908682112d9ba03ff8 Mon Sep 17 00:00:00 2001
From: miwi <miwi@FreeBSD.org>
Date: Mon, 7 Aug 2006 07:58:28 +0000
Subject: - Respect DESTDIR for all my ports

Reviewed by:	gabor
Approved by:	krion (mentor)
---
 shells/osh/Makefile  | 10 +++++-----
 shells/osh/pkg-plist |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'shells')

diff --git a/shells/osh/Makefile b/shells/osh/Makefile
index f79daa1123c..c4425cc18cd 100644
--- a/shells/osh/Makefile
+++ b/shells/osh/Makefile
@@ -16,10 +16,10 @@ COMMENT=	An implementation of the UNIX 6th Edition shell
 MAN1=		fd2.1 goto.1 if.1 osh.1
 
 post-install:
-	@${ECHO_MSG} "updating /etc/shells"
-	@${CP} /etc/shells /etc/shells.bak
-	@(${GREP} -v ${PREFIX}/bin/osh /etc/shells.bak; \
-	 ${ECHO_CMD} ${PREFIX}/bin/osh) > /etc/shells
-	@${RM} /etc/shells.bak
+	@${ECHO_MSG} "updating ${DESTDIR}/etc/shells"
+	@${CP} ${DESTDIR}/etc/shells ${DESTDIR}/etc/shells.bak
+	@(${GREP} -v ${PREFIX}/bin/osh ${DESTDIR}/etc/shells.bak; \
+	 ${ECHO_CMD} ${PREFIX}/bin/osh) > ${DESTDIR}/etc/shells
+	@${RM} ${DESTDIR}/etc/shells.bak
 
 .include <bsd.port.mk>
diff --git a/shells/osh/pkg-plist b/shells/osh/pkg-plist
index 9125442c760..9dbc744d35e 100644
--- a/shells/osh/pkg-plist
+++ b/shells/osh/pkg-plist
@@ -2,5 +2,5 @@ bin/fd2
 bin/goto
 bin/if
 bin/osh
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
-@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells
+@exec echo "updating ${DESTDIR}/etc/shells"; cp ${DESTDIR}/etc/shells ${DESTDIR}/etc/shells.bak; (grep -v %D/%F ${DESTDIR}/etc/shells.bak; echo %D/%F) >${DESTDIR}/etc/shells
+@unexec echo "updating ${DESTDIR}/etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells
-- 
cgit