summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorjoerg <joerg@FreeBSD.org>1996-03-17 23:08:37 +0000
committerjoerg <joerg@FreeBSD.org>1996-03-17 23:08:37 +0000
commita93800a519ab3973e32b89367a5c1ac5a67056e4 (patch)
tree7c7fac7dd6dd12fb11122e28c71e8396032e0a71 /usr.sbin
parent39f687393755366d0c2fd42556e51547ab535d9e (diff)
downloadFreeBSD-src-a93800a519ab3973e32b89367a5c1ac5a67056e4.zip
FreeBSD-src-a93800a519ab3973e32b89367a5c1ac5a67056e4.tar.gz
libdisk is now installed as a standard library.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/sade/Makefile11
-rw-r--r--usr.sbin/sysinstall/Makefile11
2 files changed, 4 insertions, 18 deletions
diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile
index 8803325..7873d7c 100644
--- a/usr.sbin/sade/Makefile
+++ b/usr.sbin/sade/Makefile
@@ -11,17 +11,10 @@ SRCS= anonFTP.c apache.c attr.c cdrom.c command.c config.c decode.c \
makedevs.c media.c menus.c misc.c msg.c network.c nfs.c options.c \
package.c system.c tape.c tcpip.c termcap.c ufs.c variable.c wizard.c
-CFLAGS+= -Wall -I${.CURDIR}/../libdisk -I${.CURDIR}/../../gnu/lib/libdialog
+CFLAGS+= -Wall -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
+LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk
makedevs.c: Makefile rtermcap
rm -f makedevs.tmp
diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile
index 8803325..7873d7c 100644
--- a/usr.sbin/sysinstall/Makefile
+++ b/usr.sbin/sysinstall/Makefile
@@ -11,17 +11,10 @@ SRCS= anonFTP.c apache.c attr.c cdrom.c command.c config.c decode.c \
makedevs.c media.c menus.c misc.c msg.c network.c nfs.c options.c \
package.c system.c tape.c tcpip.c termcap.c ufs.c variable.c wizard.c
-CFLAGS+= -Wall -I${.CURDIR}/../libdisk -I${.CURDIR}/../../gnu/lib/libdialog
+CFLAGS+= -Wall -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
+LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk
makedevs.c: Makefile rtermcap
rm -f makedevs.tmp
OpenPOWER on IntegriCloud