diff options
| author | des <des@FreeBSD.org> | 2002-03-23 18:01:01 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-03-23 18:01:01 +0000 |
| commit | 34976224b38dc7643dd4dede1ead340e70579606 (patch) | |
| tree | 92355ca2aa629d06578a97b4126ce6bb6c5fa78a /secure | |
| parent | b4472eebdd44a451c0da5f6577cd01b5b70670e5 (diff) | |
| download | FreeBSD-src-34976224b38dc7643dd4dede1ead340e70579606.zip FreeBSD-src-34976224b38dc7643dd4dede1ead340e70579606.tar.gz | |
Install headers with -C. Ideally, these Makefiles should not need to
override the beforeinstall target at all, but this has proven difficult
to achieve.
Diffstat (limited to 'secure')
| -rw-r--r-- | secure/lib/libcrypto/Makefile | 2 | ||||
| -rw-r--r-- | secure/lib/libcrypto/Makefile.inc | 4 | ||||
| -rw-r--r-- | secure/lib/libssl/Makefile | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 31f632c..f7bbd10 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -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 diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index 6b3bbbf..3e9fc28 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -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 diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile index 2429d77..daf4a4f 100644 --- a/secure/lib/libssl/Makefile +++ b/secure/lib/libssl/Makefile @@ -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> |
