From 51955e087e4a0ae055efb74392151e4e734a7a74 Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Sun, 25 Feb 1996 20:41:07 +0000
Subject: [PATCH] Depend on libdisk.a.

---
 release/sysinstall/Makefile  | 5 +++--
 usr.sbin/sade/Makefile       | 5 +++--
 usr.sbin/sysinstall/Makefile | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/release/sysinstall/Makefile b/release/sysinstall/Makefile
index c2c3feedbc09..880332525fc4 100644
--- a/release/sysinstall/Makefile
+++ b/release/sysinstall/Makefile
@@ -13,15 +13,16 @@ SRCS=	anonFTP.c apache.c attr.c cdrom.c command.c config.c decode.c \
 
 CFLAGS+= -Wall -I${.CURDIR}/../libdisk -I${.CURDIR}/../../gnu/lib/libdialog
 
+DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL}
 LDADD=  -ldialog -lncurses -lmytinfo -lutil
 .if exists(${.CURDIR}/../libdisk/obj)
+DPADD+= ${.CURDIR}/../libdisk/obj/libdisk.a
 LDADD+= -L${.CURDIR}/../libdisk/obj -ldisk
 .else
+DPADD+= ${.CURDIR}/../libdisk/libdisk.a
 LDADD+= -L${.CURDIR}/../libdisk -ldisk
 .endif
 
-DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL}
-
 makedevs.c:	Makefile rtermcap
 	rm -f makedevs.tmp
 	echo '#include <sys/types.h>' > makedevs.tmp
diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile
index c2c3feedbc09..880332525fc4 100644
--- a/usr.sbin/sade/Makefile
+++ b/usr.sbin/sade/Makefile
@@ -13,15 +13,16 @@ SRCS=	anonFTP.c apache.c attr.c cdrom.c command.c config.c decode.c \
 
 CFLAGS+= -Wall -I${.CURDIR}/../libdisk -I${.CURDIR}/../../gnu/lib/libdialog
 
+DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL}
 LDADD=  -ldialog -lncurses -lmytinfo -lutil
 .if exists(${.CURDIR}/../libdisk/obj)
+DPADD+= ${.CURDIR}/../libdisk/obj/libdisk.a
 LDADD+= -L${.CURDIR}/../libdisk/obj -ldisk
 .else
+DPADD+= ${.CURDIR}/../libdisk/libdisk.a
 LDADD+= -L${.CURDIR}/../libdisk -ldisk
 .endif
 
-DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL}
-
 makedevs.c:	Makefile rtermcap
 	rm -f makedevs.tmp
 	echo '#include <sys/types.h>' > makedevs.tmp
diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile
index c2c3feedbc09..880332525fc4 100644
--- a/usr.sbin/sysinstall/Makefile
+++ b/usr.sbin/sysinstall/Makefile
@@ -13,15 +13,16 @@ SRCS=	anonFTP.c apache.c attr.c cdrom.c command.c config.c decode.c \
 
 CFLAGS+= -Wall -I${.CURDIR}/../libdisk -I${.CURDIR}/../../gnu/lib/libdialog
 
+DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL}
 LDADD=  -ldialog -lncurses -lmytinfo -lutil
 .if exists(${.CURDIR}/../libdisk/obj)
+DPADD+= ${.CURDIR}/../libdisk/obj/libdisk.a
 LDADD+= -L${.CURDIR}/../libdisk/obj -ldisk
 .else
+DPADD+= ${.CURDIR}/../libdisk/libdisk.a
 LDADD+= -L${.CURDIR}/../libdisk -ldisk
 .endif
 
-DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL}
-
 makedevs.c:	Makefile rtermcap
 	rm -f makedevs.tmp
 	echo '#include <sys/types.h>' > makedevs.tmp