summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--release/sysinstall/Makefile11
-rw-r--r--usr.sbin/sade/Makefile11
-rw-r--r--usr.sbin/sysinstall/Makefile11
3 files changed, 6 insertions, 27 deletions
diff --git a/release/sysinstall/Makefile b/release/sysinstall/Makefile
index 8803325..7873d7c 100644
--- a/release/sysinstall/Makefile
+++ b/release/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
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