Install headers with -C. Ideally, these Makefiles should not need to
override the beforeinstall target at all, but this has proven difficult to achieve.
This commit is contained in:
parent
d9c0a739c5
commit
de11a611b5
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=93034
@ -371,7 +371,7 @@ MLINKS= des_crypt.3 des_read_password.3 \
|
||||
des_crypt.3 des_set_odd_parity.3 des_crypt.3 des_is_weak_key.3
|
||||
|
||||
beforeinstall: openssl/opensslconf.h openssl/evp.h
|
||||
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
|
||||
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
|
||||
${CRYPTO_HDRS} openssl/evp.h openssl/opensslconf.h \
|
||||
${DESTDIR}/usr/include/openssl
|
||||
ln -fs openssl/des.h ${DESTDIR}/usr/include/des.h
|
||||
|
@ -57,11 +57,11 @@ buildinf.h:
|
||||
openssl/opensslconf.h: ../libcrypto/opensslconf-${MACHINE_ARCH}.h
|
||||
mkdir -p openssl
|
||||
cp ${.OODATE} ${.TARGET}
|
||||
${INSTALL} ${COPY} -m 444 ${CRYPTO_HDRS} ${EXTRA_HDRS} openssl
|
||||
${INSTALL} -C -m 444 ${CRYPTO_HDRS} ${EXTRA_HDRS} openssl
|
||||
|
||||
openssl/evp.h: ${LCRYPTO_SRC}/evp/evp.h
|
||||
.if !defined(MAKE_IDEA) || ${MAKE_IDEA} != YES
|
||||
sed '/^#ifndef NO_IDEA$$/,/^#endif$$/d' ${.OODATE} > ${.TARGET}
|
||||
.else
|
||||
${INSTALL} ${COPY} -m 444 ${.OODATE} ${.TARGET}
|
||||
${INSTALL} -C -m 444 ${.OODATE} ${.TARGET}
|
||||
.endif
|
||||
|
@ -29,7 +29,7 @@ SSL_HDRS+= ${LCRYPTOSSL_SRC}/${h}
|
||||
.endfor
|
||||
|
||||
beforeinstall: openssl/opensslconf.h openssl/evp.h
|
||||
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
|
||||
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
|
||||
${SSL_HDRS} ${DESTDIR}/usr/include/openssl
|
||||
|
||||
.include <bsd.lib.mk>
|
||||
|
Loading…
Reference in New Issue
Block a user