From 7c52a96f97ef04797c68dbfed1bdf23ef2b6bb59 Mon Sep 17 00:00:00 2001
From: sketch <sketch@pkgsrc.org>
Date: Wed, 4 Jun 2008 13:34:46 +0000
Subject: Support alternate ${PREFIX}.

---
 pkgtools/rc.subr/Makefile | 12 ++++++------
 pkgtools/rc.subr/PLIST    |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'pkgtools/rc.subr')

diff --git a/pkgtools/rc.subr/Makefile b/pkgtools/rc.subr/Makefile
index 5f059722417..4ffee4c4565 100644
--- a/pkgtools/rc.subr/Makefile
+++ b/pkgtools/rc.subr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/04/23 11:54:53 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2008/06/04 13:34:46 sketch Exp $
 #
 
 DISTNAME=		rc.subr-20080423
@@ -31,13 +31,13 @@ do-extract:
 	@${CP} -R ${FILESDIR} ${WRKSRC}
 
 do-install:
-	${INSTALL_DATA_DIR} ${RCD_SCRIPTS_DIR}
+	${INSTALL_DATA_DIR} ${PREFIX}${RCD_SCRIPTS_DIR}
 	${INSTALL_DATA} ${WRKSRC}/rc.conf.example ${PREFIX}etc/rc.conf.example
 	${INSTALL_DATA} ${WRKSRC}/rc.subr ${PREFIX}etc/rc.subr
-	${INSTALL_SCRIPT} ${WRKSRC}/rc.d/DAEMON ${RCD_SCRIPTS_DIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/rc.d/LOGIN ${RCD_SCRIPTS_DIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/rc.d/NETWORKING ${RCD_SCRIPTS_DIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/rc.d/SERVERS ${RCD_SCRIPTS_DIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/rc.d/DAEMON ${PREFIX}${RCD_SCRIPTS_DIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/rc.d/LOGIN ${PREFIX}${RCD_SCRIPTS_DIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/rc.d/NETWORKING ${PREFIX}${RCD_SCRIPTS_DIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/rc.d/SERVERS ${PREFIX}${RCD_SCRIPTS_DIR}
 
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/pkgtools/rc.subr/PLIST b/pkgtools/rc.subr/PLIST
index d441fdaff87..d600f96b15c 100644
--- a/pkgtools/rc.subr/PLIST
+++ b/pkgtools/rc.subr/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2004/08/01 08:56:10 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/06/04 13:34:46 sketch Exp $
 etc/rc.conf.example
 etc/rc.subr
 ${RCD_SCRIPTS_DIR}/DAEMON
 ${RCD_SCRIPTS_DIR}/LOGIN
 ${RCD_SCRIPTS_DIR}/NETWORKING
 ${RCD_SCRIPTS_DIR}/SERVERS
-@unexec ${RMDIR} ${RCD_SCRIPTS_DIR} 2> /dev/null || ${TRUE}
+@unexec ${RMDIR} %D/${RCD_SCRIPTS_DIR} 2> /dev/null || ${TRUE}
-- 
cgit v1.2.3