diff options
| author | Björn Gustavsson <[email protected]> | 2013-10-17 17:03:25 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-10-17 17:03:25 +0200 |
| commit | d09b60bb7dc9b588520a0ac4531110f7b43f6979 (patch) | |
| tree | c47a16685d3a7b69858171e175e9d584f98585b2 /lib/asn1/src/Makefile | |
| parent | 717cf073d2c4ccbb508a272486ec83369ed1f043 (diff) | |
| parent | d52be57446a2d0d15e3f67d2beb834fbad1b578e (diff) | |
| download | otp-d09b60bb7dc9b588520a0ac4531110f7b43f6979.tar.gz otp-d09b60bb7dc9b588520a0ac4531110f7b43f6979.tar.bz2 otp-d09b60bb7dc9b588520a0ac4531110f7b43f6979.zip | |
Merge branch 'maint'
* maint:
Cope with .erlang files that print to stdout
Diffstat (limited to 'lib/asn1/src/Makefile')
| -rw-r--r-- | lib/asn1/src/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile index 3f24e15c04..500f4a1358 100644 --- a/lib/asn1/src/Makefile +++ b/lib/asn1/src/Makefile @@ -135,7 +135,7 @@ $(EBIN)/asn1ct_func.$(EMULATOR): asn1ct_func.erl asn1ct_eval_%.erl: asn1ct_eval_%.funcs $(gen_verbose)erl -pa $(EBIN) -noshell -noinput \ - -run prepare_templates gen_asn1ct_eval $< >$@ + -run prepare_templates gen_asn1ct_eval $< $(APP_TARGET): $(APP_SRC) ../vsn.mk $(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@ @@ -180,7 +180,7 @@ RT_TEMPLATES_TARGET = $(RT_TEMPLATES:%=%.$(EMULATOR)) asn1ct_rtt.erl: prepare_templates.$(EMULATOR) $(RT_TEMPLATES_TARGET) $(gen_verbose)erl -noshell -noinput -run prepare_templates gen_asn1ct_rtt \ - $(RT_TEMPLATES_TARGET) >asn1ct_rtt.erl + $(RT_TEMPLATES_TARGET) prepare_templates.$(EMULATOR): prepare_templates.erl $(V_ERLC) prepare_templates.erl |