Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Weird. The official OTP tarball disagrees with the git repo. Updating…

… to match the official tarball.
  • Loading branch information...
commit ec891b55f10d78665546ad09c8563b223fbf7e88 1 parent 0ad5226
@tonyg authored
Showing with 8 additions and 8 deletions.
  1. +7 −7 Makefile
  2. +1 −1  src/rfc4627_jsonrpc_inets.erl
View
14 Makefile
@@ -11,15 +11,15 @@ SIGNING_KEY_ID=F8D7D525
VERSION=HEAD
PACKAGE_NAME=rfc4627_jsonrpc
-## The path to httpd.hrl changed sometime between OTP R12 and R13B03,
-## and then changed again between OTP R14B and R14B01. Detect the
-## changes, and supply compile-time macro definitions to allow
-## rfc4627_jsonrpc_inets.erl to adapt to the new paths.
+## The path to httpd.hrl changed at R14A, and then changed again
+## between OTP R14B and R14B01. Detect the changes, and supply
+## compile-time macro definitions to allow rfc4627_jsonrpc_inets.erl
+## to adapt to the new paths.
ERLANG_OTP_RELEASE:=$(shell erl -noshell -eval 'io:format(erlang:system_info(otp_release)), halt().')
$(info Building for OTP release $(ERLANG_OTP_RELEASE).)
-ifeq ($(shell test R13B03 \> $(ERLANG_OTP_RELEASE) && echo yes),yes)
-$(info Using path to INETS httpd.hrl that existed before R13B03.)
-INETS_DEF=-Dinets_pre_r13b03
+ifeq ($(shell test R14A \> $(ERLANG_OTP_RELEASE) && echo yes),yes)
+$(info Using path to INETS httpd.hrl that existed before R14A.)
+INETS_DEF=-Dinets_pre_r14a
else
ifeq ($(shell test R14B01 \> $(ERLANG_OTP_RELEASE) && echo yes),yes)
$(info Using path to INETS httpd.hrl that existed before R14B01.)
View
2  src/rfc4627_jsonrpc_inets.erl
@@ -91,7 +91,7 @@
%% The path to httpd.hrl has changed with various OTP releases. Our
%% Makefile detects the changes for us, and supplies compile-time
%% macro definitions to allow us to adapt.
--ifdef(inets_pre_r13b03).
+-ifdef(inets_pre_r14a).
-include_lib("inets/src/httpd.hrl").
-else.
-ifdef(inets_pre_r14b01).
Please sign in to comment.
Something went wrong with that request. Please try again.