diff options
author | Rickard Green <[email protected]> | 2017-08-28 15:00:48 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2017-08-28 15:00:48 +0200 |
commit | 3aa559f584559af3a76ecd8c2367f59e062dbe0e (patch) | |
tree | 8cdd89cabdb2b6592f03627826a7b7041441d178 /erts/doc/src/Makefile | |
parent | 7d8beec59350c1b3e92cee50c222f8e2ccdd30d5 (diff) | |
parent | ffd59fbd9ac262b7aba4b86e7da4992a3e668e24 (diff) | |
download | otp-3aa559f584559af3a76ecd8c2367f59e062dbe0e.tar.gz otp-3aa559f584559af3a76ecd8c2367f59e062dbe0e.tar.bz2 otp-3aa559f584559af3a76ecd8c2367f59e062dbe0e.zip |
Merge branch 'rickard/dist/OTP-14459' into rickard/dist/master/OTP-14459
Conflicts:
erts/emulator/beam/bif.c
erts/emulator/beam/dist.c
erts/emulator/beam/dist.h
erts/emulator/beam/erl_bif_info.c
erts/emulator/beam/erl_node_tables.c
erts/emulator/beam/erl_node_tables.h
erts/emulator/beam/external.c
Diffstat (limited to 'erts/doc/src/Makefile')
-rw-r--r-- | erts/doc/src/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/doc/src/Makefile b/erts/doc/src/Makefile index b96cbbce40..444adf4a6e 100644 --- a/erts/doc/src/Makefile +++ b/erts/doc/src/Makefile @@ -173,6 +173,8 @@ release_docs_spec: docs "$(RELSYSDIR)/doc/html" $(INSTALL_DATA) $(ERL_TOP)/erts/example/time_compat.erl \ "$(RELSYSDIR)/doc/html" + $(INSTALL_DATA) $(ERL_TOP)/lib/kernel/examples/gen_tcp_dist/src/gen_tcp_dist.erl \ + "$(RELSYSDIR)/doc/html" $(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)" $(INSTALL_DIR) "$(RELEASE_PATH)/man/man3" $(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3" |