diff --git a/Makefile b/Makefile index 8f6b226be17b..28bc99c487f2 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ ENV_DOCKER ?= docker ENV_DOCKER_COMPOSE ?= docker-compose --project-directory $(CURDIR) -p $(project_name) -f $(project_compose_ci) ENV_NGINX ?= $(ENV_NGINX_EXEC) -p $(CURDIR) -c $(CURDIR)/conf/nginx.conf ENV_NGINX_EXEC := $(shell command -v openresty 2>/dev/null || command -v nginx 2>/dev/null) -ENV_OPENSSL_PREFIX := /usr/local/openssl +ENV_OPENSSL_PREFIX ?= /usr/local/openssl ifeq ($(wildcard $(ENV_OPENSSL_PREFIX)/lib),) OPENSSL_LIB_DIR := $(ENV_OPENSSL_PREFIX)/lib64 #When /lib doesn't exist else diff --git a/utils/install-openssl-fips.sh b/utils/install-openssl-fips.sh index 4d88c2e71d75..4bb11b695cd1 100755 --- a/utils/install-openssl-fips.sh +++ b/utils/install-openssl-fips.sh @@ -28,7 +28,7 @@ if [ ! -d "$(pwd)/openssl-3.1.3" ]; then sudo make install export LD_LIBRARY_PATH=$OPENSSL3_PREFIX${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} sudo ldconfig - export openssl_prefix="$OPENSSL3_PREFIX" + export openssl_prefix="/usr/local/openssl" cd .. fi diff --git a/utils/install-openssl.sh b/utils/install-openssl.sh index 0c795334b446..202559480df0 100755 --- a/utils/install-openssl.sh +++ b/utils/install-openssl.sh @@ -28,7 +28,7 @@ if [ ! -d "$(pwd)/openssl-3.1.3" ]; then sudo make install export LD_LIBRARY_PATH=$OPENSSL3_PREFIX${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} sudo ldconfig - export openssl_prefix="$OPENSSL3_PREFIX" + export openssl_prefix="/usr/local/openssl" ls /usr/local/openssl cd .. fi