diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2002-05-12 16:01:00 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2002-05-12 16:01:00 +0000 |
| commit | c7b111cba82a6eafca66d37944c7293fb1a11000 (patch) | |
| tree | 57ff969855b4ca919ff4d533236ef90e163b1e76 /secure/lib/libcrypto | |
| parent | 26e5d4d14fe0a1a8c1169a4f02b167aa6b26e2e7 (diff) | |
Notes
Diffstat (limited to 'secure/lib/libcrypto')
| -rw-r--r-- | secure/lib/libcrypto/Makefile | 8 | ||||
| -rw-r--r-- | secure/lib/libcrypto/Makefile.inc | 11 |
2 files changed, 6 insertions, 13 deletions
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 71166cb9bb0e..9ad59f0292f7 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -365,11 +365,9 @@ 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 - ${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 +INCS= ${HDRS} openssl/evp.h openssl/opensslconf.h +INCSDIR= /usr/include/openssl +INCSLINKS= openssl/des.h ${INCLUDEDIR}/des.h afterinstall: .if !defined(NOPIC) diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index ec09438f8667..352d9152810b 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -29,10 +29,6 @@ HDRS= asn1/asn1.h asn1/asn1_mac.h bio/bio.h bf/blowfish.h bn/bn.h \ HDRS+= idea/idea.h .endif -.for h in ${HDRS} -CRYPTO_HDRS+= ${LCRYPTO_SRC}/${h} -.endfor - SRCS+= buildinf.h openssl/opensslconf.h openssl/evp.h CLEANFILES+= buildinf.h openssl/opensslconf.h openssl/evp.h CLEANDIRS+= openssl @@ -46,17 +42,16 @@ buildinf.h: echo "#endif" ) > ${.TARGET} # XXX: The openssl/ dependencies are not correct, in that a change in -# any of ${CRYPTO_HDRS} ${EXTRA_HDRS} will no repopulate openssl/. +# any of ${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} -C -m 444 ${CRYPTO_HDRS} ${EXTRA_HDRS} openssl + ${INSTALL} -C -m 444 ${HDRS:S;^;${LCRYPTO_SRC}/;} ${EXTRA_HDRS} openssl openssl/evp.h: ${LCRYPTO_SRC}/evp/evp.h + mkdir -p openssl .if !defined(MAKE_IDEA) || ${MAKE_IDEA} != YES sed '/^#ifndef NO_IDEA$$/,/^#endif$$/d' ${.OODATE} > ${.TARGET} .else |