diff options
| author | markm <markm@FreeBSD.org> | 2003-05-05 07:58:44 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2003-05-05 07:58:44 +0000 |
| commit | ee63e7dc15cc9a4f4ef4c40ed7ae743aa0706003 (patch) | |
| tree | 56d309156db9452465ff78724b6b4c3a6e0cbcba /release | |
| parent | a7d933895cee5d8535b76f436f05f14decfd5967 (diff) | |
| download | FreeBSD-src-ee63e7dc15cc9a4f4ef4c40ed7ae743aa0706003.zip FreeBSD-src-ee63e7dc15cc9a4f4ef4c40ed7ae743aa0706003.tar.gz | |
Turn MAKE_KERBEROS5 into NO_KERBEROS by negating the logic. Some extra
cleanups were necessary in release/Makefile, and the tinderbox code
was syntax checked, not run checked.
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/release/Makefile b/release/Makefile index 531654b..f7b3366 100644 --- a/release/Makefile +++ b/release/Makefile @@ -220,14 +220,10 @@ DISKLABEL?= disklabel ZIPNSPLIT= gzip --no-name -9 -c | split -b 1423k - -# Things that need to be recompiled with Kerberos support. -.if exists(${.CURDIR}/../kerberos5) && exists(${.CURDIR}/../crypto) && !defined(NOKERBEROS) -K5PROGS!= cd ${.CURDIR}/../kerberos5; ${MAKE} -V KPROGS -.endif - # Things that need to be compiled without crypto support in releases .if !defined(FIXCRYPTO) -FIXCRYPTO= bin/ed usr.sbin/ppp usr.sbin/pppd usr.sbin/tcpdump/tcpdump \ +FIXCRYPTO!= cd ${.CURDIR}/../kerberos5; ${MAKE} -V KPROGS +FIXCRYPTO+= bin/ed usr.sbin/ppp usr.sbin/pppd usr.sbin/tcpdump/tcpdump \ lib/libfetch usr.bin/fetch .if !defined(NO_SENDMAIL) FIXCRYPTO+= usr.sbin/sendmail @@ -424,7 +420,6 @@ release rerelease: MAKE_ISOS \ NOCDROM \ NODOC \ - NOKERBEROS \ NOPORTS \ NOSHARED \ NOSRC \ @@ -520,13 +515,6 @@ release.3: ${CROSSMAKE} ${WORLD_FLAGS} -DNO_MAKEDB_RUN -DNOCRYPT \ SUBDIR_OVERRIDE="${FIXCRYPTO}" \ buildworld distributeworld DISTDIR=${RD}/trees -.if exists(${.CURDIR}/../kerberos5) && exists(${.CURDIR}/../crypto) && !defined(NOKERBEROS) - cd ${.CURDIR}/..; \ - ${CROSSMAKE} ${WORLD_FLAGS} -DNO_MAKEDB_RUN -DMAKE_KERBEROS5 \ - SUBDIR_OVERRIDE="kerberos5 ${K5PROGS}" \ - buildworld distributeworld DISTDIR=${RD}/trees - rm -f ${RD}/trees/krb5/usr/share/info/dir -.endif -chflags -R noschg ${RD}/trees touch release.3 |
