aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2011-10-18 14:10:53 +0200
committerAnders Svensson <[email protected]>2011-10-19 17:48:40 +0200
commite89a59263762c1b625b1b054784b73112fb440a3 (patch)
tree16fec3c6f38f8645077de66b018103ee60400a9e
parent955bbc378a146611929551cdabcfe63264a570ac (diff)
downloadotp-e89a59263762c1b625b1b054784b73112fb440a3.tar.gz
otp-e89a59263762c1b625b1b054784b73112fb440a3.tar.bz2
otp-e89a59263762c1b625b1b054784b73112fb440a3.zip
Dumb down opt/release targets to make 3.80
-rw-r--r--lib/diameter/src/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile
index ea1e43875e..15196bc002 100644
--- a/lib/diameter/src/Makefile
+++ b/lib/diameter/src/Makefile
@@ -42,6 +42,9 @@ RELSYSDIR = $(RELEASE_PATH)/lib/diameter-$(VSN)
EBIN = ../ebin
INCDIR = ../include
+# Dumbed down to make 3.80. In 3.81 and later it's just $(realpath $(EBIN)).
+ABS_EBIN := $(shell cd $(EBIN) && pwd)
+
# Where make should look for dependencies.
VPATH = .:base:compiler:transport:gen
@@ -103,7 +106,7 @@ ERL_COMPILE_FLAGS += \
+'{attribute,insert,app_vsn,$(APP_VSN)}' \
+warn_export_vars \
+warn_unused_vars \
- -pa $(realpath $(EBIN)) \
+ -pa $(ABS_EBIN) \
-I $(INCDIR) \
-I gen
# -pa is to be able to include_lib from the include directory: the
@@ -228,7 +231,7 @@ depend.mk: depend.sed $(MODULES:%=%.erl) Makefile
.PHONY: $(TARGET_DIRS:%/=%) $(TARGET_DIRS:%/=release_src_%)
# ----------------------------------------------------
-# Targets using secondary expansion
+# Targets using secondary expansion (make >= 3.81)
# ----------------------------------------------------
.SECONDEXPANSION: