diff options
| author | Erlang/OTP <[email protected]> | 2019-03-05 23:50:39 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-03-05 23:50:39 +0100 |
| commit | 3ec4257f6f93656d3f58f864ed8aa585788b7d0f (patch) | |
| tree | e0aa9125a27b3acd70714d44dd4e1b5c9c702304 /.gitignore | |
| parent | f30b1052c7097a95faaba272feccc6190682a7f8 (diff) | |
| parent | b32a929bbb287c318f44cb0ecf17716c480f11ee (diff) | |
| download | otp-3ec4257f6f93656d3f58f864ed8aa585788b7d0f.tar.gz otp-3ec4257f6f93656d3f58f864ed8aa585788b7d0f.tar.bz2 otp-3ec4257f6f93656d3f58f864ed8aa585788b7d0f.zip | |
Merge branch 'rickard/make-fixes-21/OTP-15551' into maint-21
* rickard/make-fixes-21/OTP-15551:
Fix install phase in build system
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 0e9d07757f..b90bda1763 100644 --- a/.gitignore +++ b/.gitignore @@ -139,6 +139,7 @@ JAVADOC-GENERATED /make/output.mk /make/emd2exml /make/make_emakefile +/make/install_dir_data.sh # Created by "out_build update_primary" /bootstrap/primary_compiler/ @@ -307,6 +308,7 @@ JAVADOC-GENERATED /lib/jinterface/doc/html/java /lib/jinterface/pom.xml /lib/jinterface/target +/lib/jinterface/doc/src/jdoc # kernel @@ -361,7 +363,6 @@ JAVADOC-GENERATED /system/doc/html /system/doc/xml /system/doc/top/PR.template -/system/doc/top/erlresolvelinks.js # test_server |