diff options
author | Lukas Larsson <[email protected]> | 2016-08-12 11:27:33 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2016-08-12 11:27:33 +0200 |
commit | 9cd8c5319a9ffd71fc5f8db755b4014f199fc0f2 (patch) | |
tree | 52d5945fc0b4adde8fc73ba3f0e410f3c02b7828 /lib/diameter/src/Makefile | |
parent | cd54106596b3471b42b59693a40e21b58729cdb0 (diff) | |
parent | daa0f831aee9dedf8cdf29fd5f97f98f55e072e3 (diff) | |
download | otp-9cd8c5319a9ffd71fc5f8db755b4014f199fc0f2.tar.gz otp-9cd8c5319a9ffd71fc5f8db755b4014f199fc0f2.tar.bz2 otp-9cd8c5319a9ffd71fc5f8db755b4014f199fc0f2.zip |
Merge branch 'maint'
Conflicts:
lib/gs/doc/src/Makefile
Diffstat (limited to 'lib/diameter/src/Makefile')
-rw-r--r-- | lib/diameter/src/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile index 7f61620fc1..6bf748a727 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile @@ -123,7 +123,7 @@ ERL_COMPILE_FLAGS += \ # erl/hrl from dictionary file. gen/diameter_gen_%.erl gen/diameter_gen_%.hrl: dict/%.dia $(dia_verbose) \ - ../bin/diameterc -o gen -i $(EBIN) $< + escript ../bin/diameterc -o gen -i $(EBIN) $< opt: $(TARGET_FILES) |