From 0404cd92c4285b3a4f011bdc9d81517a1a182c63 Mon Sep 17 00:00:00 2001 From: Simon Unge Date: Mon, 7 Aug 2023 16:06:49 -0700 Subject: [PATCH] Fix for OTP 26. And use halt instead of stop --- c_src/Makefile | 6 +++--- java_src/Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/c_src/Makefile b/c_src/Makefile index 000eae9..2eb2ecc 100644 --- a/c_src/Makefile +++ b/c_src/Makefile @@ -6,9 +6,9 @@ BASEDIR := $(abspath $(CURDIR)/..) PROJECT ?= $(notdir $(BASEDIR)) PROJECT := $(strip $(PROJECT)) -ERTS_INCLUDE_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s/erts-~s/include/\", [code:root_dir(), erlang:system_info(version)]).") -ERL_INTERFACE_INCLUDE_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s\", [code:lib_dir(erl_interface, include)]).") -ERL_INTERFACE_LIB_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s\", [code:lib_dir(erl_interface, lib)]).") +ERTS_INCLUDE_DIR ?= $(shell erl -noshell -eval "io:format(\"~s/erts-~s/include/\", [code:root_dir(), erlang:system_info(version)])." -s erlang halt) +ERL_INTERFACE_INCLUDE_DIR ?= $(shell erl -noshell -eval "io:format(\"~s\", [code:lib_dir(erl_interface, include)])." -s erlang halt) +ERL_INTERFACE_LIB_DIR ?= $(shell erl -noshell -eval "io:format(\"~s\", [code:lib_dir(erl_interface, lib)])." -s erlang halt) C_SRC_DIR = $(CURDIR) C_SRC_OUTPUT ?= $(CURDIR)/../priv/$(PROJECT).so diff --git a/java_src/Makefile b/java_src/Makefile index 90d53fe..494870d 100644 --- a/java_src/Makefile +++ b/java_src/Makefile @@ -2,7 +2,7 @@ CURDIR := . -JINTERFACE_PRIV_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s\", [code:priv_dir(jinterface)]).") +JINTERFACE_PRIV_DIR ?= $(shell erl -noshell -eval "io:format(\"~s\", [code:priv_dir(jinterface)])." -s erlang halt) JAVA_SRC_DIR = $(CURDIR)/java_src JAVA_SRC_OUTPUT ?= $(CURDIR)/priv/JavaErlang.jar