summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryar <yar@FreeBSD.org>2006-07-31 19:15:10 +0000
committeryar <yar@FreeBSD.org>2006-07-31 19:15:10 +0000
commit73ebfe88f61c7a436472f5c6b29ba96f06ba7d59 (patch)
tree105d5da1119b8e09f6203a5fc3abae20bdfb5674
parentf4c396a7b53b98dc165ba04e8ab148e369fad1fb (diff)
downloadFreeBSD-src-73ebfe88f61c7a436472f5c6b29ba96f06ba7d59.zip
FreeBSD-src-73ebfe88f61c7a436472f5c6b29ba96f06ba7d59.tar.gz
inetd and telnetd are not included in the standard release
crunched floppies, but they can be included as options in src/release/picobsd (omitted by default though.) Therefore preserve the RELEASE_CRUNCH knob in their Makefiles, but tell its real purpose in a comment.
-rw-r--r--libexec/telnetd/Makefile3
-rw-r--r--usr.sbin/inetd/Makefile1
2 files changed, 4 insertions, 0 deletions
diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile
index 1519170..9a4adca 100644
--- a/libexec/telnetd/Makefile
+++ b/libexec/telnetd/Makefile
@@ -30,6 +30,8 @@ LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a
DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET}
LDADD= -lutil -ltermcap ${LIBTELNET}
+# XXX for src/release/picobsd
+.if !defined(RELEASE_CRUNCH)
.if ${MK_OPENSSL} != "no"
SRCS+= authenc.c
CFLAGS+= -DAUTHENTICATION -DENCRYPTION
@@ -42,5 +44,6 @@ CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write
DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR}
LDADD+= -lkrb5 -lasn1 -lroken -lcom_err
.endif
+.endif
.include <bsd.prog.mk>
diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile
index 2939871..35f2c22 100644
--- a/usr.sbin/inetd/Makefile
+++ b/usr.sbin/inetd/Makefile
@@ -19,6 +19,7 @@ CFLAGS+= -DINET6
DPADD= ${LIBUTIL} ${LIBWRAP}
LDADD= -lutil -lwrap
+# XXX for src/release/picobsd
.if !defined(RELEASE_CRUNCH)
CFLAGS+= -DIPSEC
DPADD+= ${LIBIPSEC}
OpenPOWER on IntegriCloud