[pkgsrc/trunk]: pkgsrc/sysutils/mklivecd Other packages' commands may not be ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cbe9132124db
branches:  trunk
changeset: 475582:cbe9132124db
user:      uebayasi <uebayasi%pkgsrc.org@localhost>
date:      Thu May 20 02:11:41 2004 +0000

description:
Other packages' commands may not be found in ${PREFIX} nowadays.  Fix it.

diffstat:

 sysutils/mklivecd/Makefile          |  3 ++-
 sysutils/mklivecd/files/mklivecd.sh |  8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r 42b43273f9c5 -r cbe9132124db sysutils/mklivecd/Makefile
--- a/sysutils/mklivecd/Makefile        Wed May 19 19:26:38 2004 +0000
+++ b/sysutils/mklivecd/Makefile        Thu May 20 02:11:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/05/19 12:22:42 uebayasi Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/20 02:11:41 uebayasi Exp $
 
 DISTNAME=      mklivecd-0.6
 CATEGORIES=    sysutils
@@ -27,6 +27,7 @@
 
 do-install:
        @${SED} -e "s,@PREFIX@,${PREFIX},g" \
+               -e "s,@LOCALBASE@,${LOCALBASE},g" \
                -e "s,@MACHINE_ARCH@,${MACHINE_ARCH},g" \
                ${FILESDIR}/mklivecd.sh > ${WRKDIR}/mklivecd
        ${INSTALL_DATA_DIR} ${PREFIX}/share/mklivecd
diff -r 42b43273f9c5 -r cbe9132124db sysutils/mklivecd/files/mklivecd.sh
--- a/sysutils/mklivecd/files/mklivecd.sh       Wed May 19 19:26:38 2004 +0000
+++ b/sysutils/mklivecd/files/mklivecd.sh       Thu May 20 02:11:41 2004 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: mklivecd.sh,v 1.13 2004/05/01 10:46:11 xtraeme Exp $
+# $NetBSD: mklivecd.sh,v 1.14 2004/05/20 02:11:41 uebayasi Exp $
 #
 # Copyright (c) 2004 Juan RP <xtraeme%NetBSD.org@localhost>
 # All rights reserved.
@@ -40,8 +40,8 @@
 tmp_file="/tmp/${progname}.$$"
 mntstat="$config_dir/mount.stat"
 
-MKISOFS="@PREFIX@/bin/mkisofs"
-CDRECORD="@PREFIX@/bin/cdrecord"
+MKISOFS="@LOCALBASE@/bin/mkisofs"
+CDRECORD="@LOCALBASE@/bin/cdrecord"
 #
 # Don't modify it! they are needed for booting grub
 MKISOFS_FIXED_ARGS="-no-emul-boot -boot-load-size 30 -boot-info-table"
@@ -349,7 +349,7 @@
                cat > $ISODIR/etc/rc.d/root <<_EOF_
 #!/bin/sh
 #
-# \$NetBSD: mklivecd.sh,v 1.13 2004/05/01 10:46:11 xtraeme Exp $
+# \$NetBSD: mklivecd.sh,v 1.14 2004/05/20 02:11:41 uebayasi Exp $
 # 
 
 # PROVIDE: root