diff options
| author | green <green@FreeBSD.org> | 2000-08-24 19:06:55 +0000 |
|---|---|---|
| committer | green <green@FreeBSD.org> | 2000-08-24 19:06:55 +0000 |
| commit | 37ca913ab79bb21bd9498f196b06c7fb58f7dc65 (patch) | |
| tree | 46bba6ce5a585df1b7a714bfe7f37f33dbb808eb | |
| parent | 2aff7a5e803e4bc8da3286b4fee7d3b5a2b9956f (diff) | |
| download | FreeBSD-src-37ca913ab79bb21bd9498f196b06c7fb58f7dc65.zip FreeBSD-src-37ca913ab79bb21bd9498f196b06c7fb58f7dc65.tar.gz | |
Make the temporary file _evp.h instead of evp.h to not conflict with
the real evp.h.
Reported by: markm
| -rw-r--r-- | secure/lib/libcrypto/Makefile | 4 | ||||
| -rw-r--r-- | secure/lib/libcrypto/Makefile.inc | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index c31ab55..226a504 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -268,13 +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 openssl/evp.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 ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ - openssl/evp.h ${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 4cbefc5..71a078a 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 openssl/evp.h -CLEANFILES+= buildinf.h openssl/opensslconf.h openssl/evp.h +SRCS+= buildinf.h openssl/opensslconf.h openssl/_evp.h +CLEANFILES+= buildinf.h openssl/opensslconf.h openssl/_evp.h CLEANDIRS+= openssl buildinf.h: @@ -31,10 +31,12 @@ buildinf.h: # any of ${CRYPTO_HDRS} ${EXTRA_HDRS} will no repopulate openssl/. # This deficiency will be fixed in a later commit. +.ORDER: openssl/opensslconf.h openssl/_evp.h + 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 +openssl/_evp.h: ${LCRYPTO_SRC}/evp/evp.h sed '/^#ifndef NO_IDEA$$/,/^#endif$$/d' ${.OODATE} > ${.TARGET} |
