summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authoruebayasi <uebayasi>2004-05-20 02:11:41 +0000
committeruebayasi <uebayasi>2004-05-20 02:11:41 +0000
commitdf94b3462ea6f509ba80d75f768ef354c5303400 (patch)
treea76d049b41be5ae518b1eb7b2b7b0a351b8c7f47 /sysutils
parentb13965a5f5be585eead2b5a3c75ba1965a597e58 (diff)
downloadpkgsrc-df94b3462ea6f509ba80d75f768ef354c5303400.tar.gz
Other packages' commands may not be found in ${PREFIX} nowadays. Fix it.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/mklivecd/Makefile3
-rwxr-xr-xsysutils/mklivecd/files/mklivecd.sh8
2 files changed, 6 insertions, 5 deletions
diff --git a/sysutils/mklivecd/Makefile b/sysutils/mklivecd/Makefile
index 06ccdb199f6..aa467123db0 100644
--- a/sysutils/mklivecd/Makefile
+++ b/sysutils/mklivecd/Makefile
@@ -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 @@ FILES= KERN-LIVECD mfs_rcd personal_config
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 --git a/sysutils/mklivecd/files/mklivecd.sh b/sysutils/mklivecd/files/mklivecd.sh
index 749436ab448..27df94b7842 100755
--- a/sysutils/mklivecd/files/mklivecd.sh
+++ b/sysutils/mklivecd/files/mklivecd.sh
@@ -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>
# All rights reserved.
@@ -40,8 +40,8 @@ pers_conffile="personal_config"
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 @@ do_cdlive()
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