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

Generate a new evp.h at build-time instead of install-time to properly

Browse Source 
support NFS(ro) installworlds.
This commit is contained in:
Brian Feldman 2000-08-23 11:41:01 +00:00
parent c62ffab640
commit 4eb207a1ae
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=65024
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
secure/lib/libcrypto/Makefile
View File

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

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

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