summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaroslav Tykhiy <ytykhiy@gmail.com>2006-07-27 14:20:14 +0000
committerYaroslav Tykhiy <ytykhiy@gmail.com>2006-07-27 14:20:14 +0000
commit2cc3124e106fbd1f61537ad2a493e74dd16f8549 (patch)
tree5cb3126543ca6aede3eb4e72da927b3e24ceabfc
parentd1773e839f6f75f906e5ed8fda29cbaa91b9e621 (diff)
Notes
-rw-r--r--usr.bin/ftp/Makefile8
-rw-r--r--usr.bin/logger/Makefile7
-rw-r--r--usr.bin/systat/Makefile13
3 files changed, 23 insertions, 5 deletions
diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile
index 25d30d476e99..c2fe59cd4b1f 100644
--- a/usr.bin/ftp/Makefile
+++ b/usr.bin/ftp/Makefile
@@ -2,6 +2,8 @@
# $NetBSD: Makefile,v 1.15 1997/10/18 15:31:20 lukem Exp $
# from: @(#)Makefile 8.2 (Berkeley) 4/3/94
+.include <bsd.own.mk>
+
# Uncomment the following to provide defaults for gate-ftp operation
#
#CFLAGS+=-DGATE_SERVER=\"ftp-gw.host\" # -DGATE_PORT=21
@@ -13,7 +15,11 @@ PROG= ftp
SRCS= cmds.c cmdtab.c complete.c domacro.c fetch.c ftp.c main.c progressbar.c \
ruserpass.c util.c
-CFLAGS+=-I${.CURDIR} -I${LUKEMFTP} -DINET6
+.if ${MK_INET6_SUPPORT} != "no"
+CFLAGS+= -DINET6
+.endif
+
+CFLAGS+= -I${.CURDIR} -I${LUKEMFTP}
LDADD= -ledit -ltermcap -lutil
DPADD= ${LIBEDIT} ${LIBTERMCAP} ${LIBUTIL}
diff --git a/usr.bin/logger/Makefile b/usr.bin/logger/Makefile
index 48c52513500d..922192ce919f 100644
--- a/usr.bin/logger/Makefile
+++ b/usr.bin/logger/Makefile
@@ -1,7 +1,12 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
+.include <bsd.own.mk>
+
PROG= logger
-CFLAGS+=-DINET6
+
+.if ${MK_INET6_SUPPORT} != "no"
+CFLAGS+= -DINET6
+.endif
.include <bsd.prog.mk>
diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile
index 3cd09f4b50a4..4f5f229725b6 100644
--- a/usr.bin/systat/Makefile
+++ b/usr.bin/systat/Makefile
@@ -1,12 +1,19 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
+.include <bsd.own.mk>
+
PROG= systat
SRCS= cmds.c cmdtab.c devs.c fetch.c iostat.c keyboard.c main.c \
- mbufs.c netcmds.c netstat.c pigs.c swap.c icmp.c icmp6.c \
- mode.c ip.c ip6.c tcp.c \
+ mbufs.c netcmds.c netstat.c pigs.c swap.c icmp.c \
+ mode.c ip.c tcp.c \
vmstat.c convtbl.c ifcmds.c ifstat.c
-CFLAGS+=-DINET6
+
+.if ${MK_INET6_SUPPORT} != "no"
+SRCS+= icmp6.c ip6.c
+CFLAGS+= -DINET6
+.endif
+
DPADD= ${LIBCURSES} ${LIBM} ${LIBDEVSTAT} ${LIBKVM}
LDADD= -lcurses -lm -ldevstat -lkvm