diff options
| author | ru <ru@FreeBSD.org> | 2004-12-21 10:16:04 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2004-12-21 10:16:04 +0000 |
| commit | f4c44b761bde292694f67f1836472277a25fcb75 (patch) | |
| tree | 39f12b382ddd99639a5d2e7415eefaadf4ff8ef9 /share | |
| parent | c1a820195c3f6961461d3e25ff7910f826995de9 (diff) | |
| download | FreeBSD-src-f4c44b761bde292694f67f1836472277a25fcb75.zip FreeBSD-src-f4c44b761bde292694f67f1836472277a25fcb75.tar.gz | |
NOCRYPT -> NO_CRYPT
Diffstat (limited to 'share')
| -rw-r--r-- | share/examples/etc/make.conf | 2 | ||||
| -rw-r--r-- | share/man/Makefile | 2 | ||||
| -rw-r--r-- | share/man/man5/make.conf.5 | 2 | ||||
| -rw-r--r-- | share/mk/bsd.compat.mk | 1 | ||||
| -rw-r--r-- | share/mk/bsd.libnames.mk | 4 |
5 files changed, 6 insertions, 5 deletions
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index 1347c87..827bc27 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -110,7 +110,7 @@ #NO_AUTHPF= # do not build and install authpf (setuid/gid) #NO_BLUETOOTH= # do not build Bluetooth related stuff #NO_BOOT= # do not build boot blocks and loader -#NOCRYPT= # do not build any crypto code +#NO_CRYPT= # do not build any crypto code #NO_CVS= # do not build CVS #NO_CXX= # do not build C++ and friends #NO_DYNAMICROOT= # do not link /bin and /sbin dynamically diff --git a/share/man/Makefile b/share/man/Makefile index 2175d0e..e068635 100644 --- a/share/man/Makefile +++ b/share/man/Makefile @@ -8,7 +8,7 @@ MAKEWHATIS?= makewhatis makedb: ${MAKEWHATIS} ${DESTDIR}${BINDIR}/man -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) ${MAKEWHATIS} ${DESTDIR}${BINDIR}/openssl/man .endif diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index ca57277..04afb73 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -535,7 +535,7 @@ Set this to run .Dq Li "${MAKE} clean" instead of .Dq Li "${MAKE} cleandir" . -.It Va NOCRYPT +.It Va NO_CRYPT .Pq Vt bool Set to not build any crypto code. .It Va NOGAMES diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index fb4c7e9..80fc062 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -3,6 +3,7 @@ .if !defined(BURN_BRIDGES) .for oldnew in \ NOATM:NO_ATM \ + NOCRYPT:NO_CRYPT \ NODOCCOMPRESS:NO_DOCCOMPRESS \ NOEXTRADEPEND:NO_EXTRADEPEND \ NOFSCHG:NO_FSCHG \ diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index dbe2c7d..9ca32d5 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -91,7 +91,7 @@ LIBOPIE?= ${DESTDIR}${LIBDIR}/libopie.a LIBPAM?= ${DESTDIR}${LIBDIR}/libpam.a MINUSLPAM= -lpam .if defined(LDFLAGS) && !empty(LDFLAGS:M-static) -.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) LIBPAM+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} \ ${LIBROKEN} ${LIBCOM_ERR} MINUSLPAM+= -lkrb5 -lasn1 -lcrypto -lcrypt -lroken -lcom_err @@ -100,7 +100,7 @@ LIBPAM+= ${LIBRADIUS} ${LIBTACPLUS} ${LIBCRYPT} \ ${LIBUTIL} ${LIBOPIE} ${LIBMD} MINUSLPAM+= -lradius -ltacplus -lcrypt \ -lutil -lopie -lmd -.if !defined(NO_OPENSSH) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NO_OPENSSH) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) LIBPAM+= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} MINUSLPAM+= -lssh -lcrypto -lcrypt .endif |
