summaryrefslogtreecommitdiffstats
path: root/sbin/sysinstall
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1995-02-01 11:15:45 +0000
committerjkh <jkh@FreeBSD.org>1995-02-01 11:15:45 +0000
commit01be8a1a7091724feeca0dbfba5f2e5c1910b584 (patch)
tree3da435906105b56cf22ffd24059e848df0a2e8b2 /sbin/sysinstall
parentc766e4d1a4ce8d3f82b684d1317d4211cc78954b (diff)
downloadFreeBSD-src-01be8a1a7091724feeca0dbfba5f2e5c1910b584.zip
FreeBSD-src-01be8a1a7091724feeca0dbfba5f2e5c1910b584.tar.gz
Do what I think Poul *intended* to do, rather than what he did.. :-)
Diffstat (limited to 'sbin/sysinstall')
-rw-r--r--sbin/sysinstall/Makefile18
1 files changed, 9 insertions, 9 deletions
diff --git a/sbin/sysinstall/Makefile b/sbin/sysinstall/Makefile
index 19236ce..e41878d 100644
--- a/sbin/sysinstall/Makefile
+++ b/sbin/sysinstall/Makefile
@@ -12,6 +12,12 @@ CFLAGS += -Wall -g -static
LDADD = -ldialog -lncurses -lmytinfo
DPADD = ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO}
+.if exists(${.CURDIR}/../../sys/i386/boot/biosboot/obj)
+BOOTS=${.CURDIR}/../../sys/i386/boot/biosboot/obj
+.else
+BOOTS=${.CURDIR}/../../sys/i386/boot/biosboot
+.endif
+
makedevs.c: dev2c.sh Makefile
mkdir -p dev
cp ${.CURDIR}/../../etc/etc.i386/MAKEDEV dev
@@ -19,16 +25,10 @@ makedevs.c: dev2c.sh Makefile
sh ${.CURDIR}/dev2c.sh dev > makedevs.tmp
rm -rf dev
uudecode < ${.CURDIR}/bteasy17.uu
- file2c 'const char boot0[] = {' '};' < \
- bteasy17 \
- >> makedevs.tmp
+ file2c 'const char boot0[] = {' '};' < bteasy17 >> makedevs.tmp
rm -rf bteasy17
- file2c 'const char boot1[] = {' '};' < \
- ../../sys/i386/boot/biosboot/boot1 \
- >> makedevs.tmp
- file2c 'const char boot2[] = {' '};' < \
- ../../sys/i386/boot/biosboot/boot2 \
- >> makedevs.tmp
+ file2c 'const char boot1[] = {' '};' < ${BOOTS}/boot1 >> makedevs.tmp
+ file2c 'const char boot2[] = {' '};' < ${BOOTS}/boot2 >> makedevs.tmp
tset -Q -S cons25 | sed 's/^.* //' | \
file2c 'const char termcap_cons25[] = {' ',0};' \
>> makedevs.tmp
OpenPOWER on IntegriCloud