From db974c34e95a24eda7ce575cc14bbc0eebfbdbb4 Mon Sep 17 00:00:00 2001
From: Brent Cook <bcook@openbsd.org>
Date: Wed, 15 Jul 2015 20:00:21 -0500
Subject: 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.
---
 crypto/Makefile.am | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'crypto')

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
 endif
 endif
 
+if OPENSSLDIR_DEFINED
+libcrypto_la_CPPFLAGS += -DOPENSSLDIR=\"@OPENSSLDIR@\"
+else
+libcrypto_la_CPPFLAGS += -DOPENSSLDIR=\"$(sysconfdir)/ssl\"
+endif
+
 noinst_LTLIBRARIES = libcompat.la libcompatnoopt.la
 
 # compatibility functions that need to be built without optimizations
-- 
cgit v1.2.3-55-g6feb