aboutsummaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2015-07-15 20:00:21 -0500
committerBrent Cook <bcook@openbsd.org>2015-07-15 20:02:38 -0500
commitdb974c34e95a24eda7ce575cc14bbc0eebfbdbb4 (patch)
treef884d9c33c5dd2c5e44b42d8b104a4117bbb2ea2 /crypto
parent4cffda193ba3fd6d0a167e5188ae52517c0c476d (diff)
downloadportable-db974c34e95a24eda7ce575cc14bbc0eebfbdbb4.tar.gz
portable-db974c34e95a24eda7ce575cc14bbc0eebfbdbb4.tar.bz2
portable-db974c34e95a24eda7ce575cc14bbc0eebfbdbb4.zip
fixup how OPENSSLDIR is derived and expanded
As per http://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Installation-Directory-Variables.html we should not try to expand variables like sysconfdir in the configure script, but rather derive the correct value in the Makefiles instead. This fixes missing expansions as the preprocessor define.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/Makefile.am6
1 files changed, 6 insertions, 0 deletions
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 4fba77b..f8c7108 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -20,6 +20,12 @@ libcrypto_la_CPPFLAGS += -DOPENSSL_NO_ASM
20endif 20endif
21endif 21endif
22 22
23if OPENSSLDIR_DEFINED
24libcrypto_la_CPPFLAGS += -DOPENSSLDIR=\"@OPENSSLDIR@\"
25else
26libcrypto_la_CPPFLAGS += -DOPENSSLDIR=\"$(sysconfdir)/ssl\"
27endif
28
23noinst_LTLIBRARIES = libcompat.la libcompatnoopt.la 29noinst_LTLIBRARIES = libcompat.la libcompatnoopt.la
24 30
25# compatibility functions that need to be built without optimizations 31# compatibility functions that need to be built without optimizations