aboutsummaryrefslogtreecommitdiffstats
path: root/lib/tools/src
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2017-04-13 11:02:06 +0200
committerSiri Hansen <[email protected]>2017-04-13 11:02:06 +0200
commit49c8f25249d1788b4bd0a066e9ff0271b3bf5a82 (patch)
treec1de14c3f1a0a1351fc80250f21bf92f4e90cf26 /lib/tools/src
parent82e849adee6e2fd20e2a3faa6ecb463cc2c7256e (diff)
parent1a2e7f14aafaac1209458dcedebd4fe723e0f302 (diff)
downloadotp-49c8f25249d1788b4bd0a066e9ff0271b3bf5a82.tar.gz
otp-49c8f25249d1788b4bd0a066e9ff0271b3bf5a82.tar.bz2
otp-49c8f25249d1788b4bd0a066e9ff0271b3bf5a82.zip
Merge branch 'siri/make/include-path/ERL-395/OTP-14339'
* siri/make/include-path/ERL-395/OTP-14339: [tools/make] Add current directory to include path
Diffstat (limited to 'lib/tools/src')
-rw-r--r--lib/tools/src/make.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/tools/src/make.erl b/lib/tools/src/make.erl
index 60695febb4..0363dee02d 100644
--- a/lib/tools/src/make.erl
+++ b/lib/tools/src/make.erl
@@ -290,11 +290,12 @@ coerce_2_list(X) when is_atom(X) ->
coerce_2_list(X) ->
X.
-%%% If you an include file is found with a modification
+%%% If an include file is found with a modification
%%% time larger than the modification time of the object
%%% file, return true. Otherwise return false.
check_includes(File, IncludePath, ObjMTime) ->
- Path = [filename:dirname(File)|IncludePath],
+ {ok,Cwd} = file:get_cwd(),
+ Path = [Cwd,filename:dirname(File)|IncludePath],
case epp:open(File, Path, []) of
{ok, Epp} ->
check_includes2(Epp, File, ObjMTime);