diff options
| author | green <green@FreeBSD.org> | 2000-08-23 11:41:01 +0000 |
|---|---|---|
| committer | green <green@FreeBSD.org> | 2000-08-23 11:41:01 +0000 |
| commit | 3226a5dc26ee7ca0774cf6ffbbf442fa0d75ff5e (patch) | |
| tree | 020c1933d43d72aede78e4dc2f7b7c408c342a6e /secure/lib/libcrypto | |
| parent | b55c3488b18998777c70bebb1753780a97b4e9b9 (diff) | |
| download | FreeBSD-src-3226a5dc26ee7ca0774cf6ffbbf442fa0d75ff5e.zip FreeBSD-src-3226a5dc26ee7ca0774cf6ffbbf442fa0d75ff5e.tar.gz | |
Generate a new evp.h at build-time instead of install-time to properly
support NFS(ro) installworlds.
Diffstat (limited to 'secure/lib/libcrypto')
| -rw-r--r-- | secure/lib/libcrypto/Makefile | 6 | ||||
| -rw-r--r-- | secure/lib/libcrypto/Makefile.inc | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 67b8128..c31ab55 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -268,15 +268,13 @@ MLINKS= des_crypt.3 des_read_password.3 \ des_crypt.3 des_enc_read.3 des_crypt.3 des_enc_write.3 \ des_crypt.3 des_set_odd_parity.3 des_crypt.3 des_is_weak_key.3 -beforeinstall: openssl/opensslconf.h +beforeinstall: openssl/opensslconf.h openssl/evp.h ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${CRYPTO_HDRS} openssl/opensslconf.h \ ${DESTDIR}/usr/include/openssl .if !defined(MAKE_IDEA) || ${MAKE_IDEA} != YES - sed '/^#ifndef NO_IDEA$$/,/^#endif$$/d' ${LCRYPTO_SRC}/evp/evp.h > \ - ${.OBJDIR}/evp.h.new ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.OBJDIR}/evp.h.new ${DESTDIR}/usr/include/openssl/evp.h + openssl/evp.h ${DESTDIR}/usr/include/openssl/evp.h .else ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${LCRYPTO_SRC}/evp/evp.h ${DESTDIR}/usr/include/openssl/evp.h diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index 5df1090..4cbefc5 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -15,8 +15,8 @@ CFLAGS+= -DL_ENDIAN WITH_RSA?= YES -SRCS+= buildinf.h openssl/opensslconf.h -CLEANFILES+= buildinf.h openssl/opensslconf.h +SRCS+= buildinf.h openssl/opensslconf.h openssl/evp.h +CLEANFILES+= buildinf.h openssl/opensslconf.h openssl/evp.h CLEANDIRS+= openssl buildinf.h: @@ -35,3 +35,6 @@ openssl/opensslconf.h: ../libcrypto/opensslconf-${MACHINE_ARCH}.h mkdir -p openssl cp ${.OODATE} ${.TARGET} ${INSTALL} ${COPY} -m 444 ${CRYPTO_HDRS} ${EXTRA_HDRS} openssl + +openssl/evp.h: ${LCRYPTO_SRC}/evp/evp.h + sed '/^#ifndef NO_IDEA$$/,/^#endif$$/d' ${.OODATE} > ${.TARGET} |
