[pkgsrc/trunk]: pkgsrc/pkgtools/rc.subr Support alternate ${PREFIX}.

[sketch <sketch%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6cd839adf745
branches:  trunk
changeset: 543109:6cd839adf745
user:      sketch <sketch%pkgsrc.org@localhost>
date:      Wed Jun 04 13:34:46 2008 +0000

description:
Support alternate ${PREFIX}.

diffstat:

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

diffs (42 lines):

diff -r 4bcddf379389 -r 6cd839adf745 pkgtools/rc.subr/Makefile
--- a/pkgtools/rc.subr/Makefile Wed Jun 04 13:12:20 2008 +0000
+++ b/pkgtools/rc.subr/Makefile Wed Jun 04 13:34:46 2008 +0000
@@ -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 @@
        @${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 -r 4bcddf379389 -r 6cd839adf745 pkgtools/rc.subr/PLIST
--- a/pkgtools/rc.subr/PLIST    Wed Jun 04 13:12:20 2008 +0000
+++ b/pkgtools/rc.subr/PLIST    Wed Jun 04 13:34:46 2008 +0000
@@ -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}