diff options
author | Richard Levitte <levitte@openssl.org> | 2016-01-30 02:57:19 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2016-02-10 14:34:06 +0100 |
commit | 5482dac9f4de7eb73d1b9c776be9495735f7e299 (patch) | |
tree | aca3c55cc204e0d9341196243f0cd5312e5e8e87 /include | |
parent | bcb1977b7f4186b5551d83839286bc02991c2ad3 (diff) | |
download | openssl-5482dac9f4de7eb73d1b9c776be9495735f7e299.tar.gz |
Configure et al: move the installation directory logic to Makefiles
The logic to figure out the combinations of --prefix and --openssldir
has stayed in Configure so far, with Unix paths as defaults.
However, since we're making Configure increasingly platform agnostic,
these defaults need to change and adapt to the platform, along with
the logic to combine them.
The easiest to provide for this is to move the logic and the defaults
away from Configure and into the build files.
This also means that the definition of the macros ENGINESDIR and
OPENSSLDIR move away from include/openssl/opensslconf.h and into the
build files.
Makefile.in is adapted accordingly.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/openssl/opensslconf.h.in | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in index c22209bdc3..d9f64292ca 100644 --- a/include/openssl/opensslconf.h.in +++ b/include/openssl/opensslconf.h.in @@ -123,13 +123,6 @@ EOF /* Generate 80386 code? */ {- $config{processor} eq "386" ? "#define" : "#undef" -} I386_ONLY -#if !defined(VMS) && !defined(__VMS) /* VMS uses logical names instead */ -# if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -# define ENGINESDIR {- quotify1($config{enginesdir}) -} -# define OPENSSLDIR {- quotify1($config{openssldir}) -} -# endif -#endif - #undef OPENSSL_UNISTD #define OPENSSL_UNISTD {- $target{unistd} -} |