d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the temporary file _evp.h instead of evp.h to not conflict with

Browse Source 
the real evp.h.

Reported by:	markm
This commit is contained in:
Brian Feldman 2000-08-24 19:06:55 +00:00
parent 2422dd7973
commit dd62c1ebeb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=65060
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
secure/lib/libcrypto/Makefile
View File

@ -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

8
secure/lib/libcrypto/Makefile.inc
View File

@ -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}