Index: Makefile
===================================================================
RCS file: /home/ncvs/src/secure/lib/libcrypto/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile	2000/08/23 11:41:00	1.22
+++ Makefile	2000/08/24 18:16:28
@@ -268,13 +268,13 @@
 	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
Index: Makefile.inc
===================================================================
RCS file: /home/ncvs/src/secure/lib/libcrypto/Makefile.inc,v
retrieving revision 1.16
diff -u -r1.16 Makefile.inc
--- Makefile.inc	2000/08/23 11:41:01	1.16
+++ Makefile.inc	2000/08/24 18:17:13
@@ -15,8 +15,8 @@
 
 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 @@
 #	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}