diff options
author | Geoff Thorpe <geoff@openssl.org> | 2004-06-01 03:18:58 +0000 |
---|---|---|
committer | Geoff Thorpe <geoff@openssl.org> | 2004-06-01 03:18:58 +0000 |
commit | 9081980565988d351582998148782a8c91a55e93 (patch) | |
tree | fa4e3068e81ec6f22d42877968ba7371e5053d33 /crypto | |
parent | 393b704d282909dff28bdca80e2d8a1d404086f4 (diff) | |
download | openssl-9081980565988d351582998148782a8c91a55e93.tar.gz |
This fixes the installation target for dynamic engines, which was trying to
install to a different location than it had created. (BTW, VMS will need a
matching fix in eng_list.c.) Note, these aren't ssl-specific, so I'm
putting "engines/" into the libs directory rather than at the "--prefix"
level or inside "ssl/".
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/engine/eng_list.c | 2 | ||||
-rw-r--r-- | crypto/opensslconf.h.in | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/crypto/engine/eng_list.c b/crypto/engine/eng_list.c index 67d67df3ce..f337e0f3bc 100644 --- a/crypto/engine/eng_list.c +++ b/crypto/engine/eng_list.c @@ -397,7 +397,7 @@ ENGINE *ENGINE_by_id(const char *id) #ifdef OPENSSL_SYS_VMS if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = "SSLROOT:[ENGINES]"; #else - if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = OPENSSLDIR "/engines"; + if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = ENGINESDIR; #endif iterator = ENGINE_by_id("dynamic"); if(!iterator || !ENGINE_ctrl_cmd_string(iterator, "ID", id, 0) || diff --git a/crypto/opensslconf.h.in b/crypto/opensslconf.h.in index 685e83b7a3..cee83acf98 100644 --- a/crypto/opensslconf.h.in +++ b/crypto/opensslconf.h.in @@ -5,6 +5,7 @@ #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) +#define ENGINESDIR "/usr/local/lib/engines" #define OPENSSLDIR "/usr/local/ssl" #endif #endif |