diff options
| author | Rickard Green <[email protected]> | 2019-03-04 17:41:19 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-03-04 17:41:19 +0100 |
| commit | 939dba97deefb09289f7f983527829371bcd381b (patch) | |
| tree | 3490fad1d27e890b9325d48519f1c11ed7cb9611 /.gitignore | |
| parent | 2052caebf9a9b8d25e1873d9c850b272a98d4680 (diff) | |
| parent | 05c5720845e0e2142a3b1c6e4b1e9f1e22c19a5c (diff) | |
| download | otp-939dba97deefb09289f7f983527829371bcd381b.tar.gz otp-939dba97deefb09289f7f983527829371bcd381b.tar.bz2 otp-939dba97deefb09289f7f983527829371bcd381b.zip | |
Merge branch 'rickard/make-fixes-22/OTP-15551'
* rickard/make-fixes-22/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 8dd66f605a..9497169cde 100644 --- a/.gitignore +++ b/.gitignore @@ -142,6 +142,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/ @@ -317,6 +318,7 @@ JAVADOC-GENERATED /lib/jinterface/doc/html/java /lib/jinterface/pom.xml /lib/jinterface/target +/lib/jinterface/doc/src/jdoc # kernel @@ -371,7 +373,6 @@ JAVADOC-GENERATED /system/doc/html /system/doc/xml /system/doc/top/PR.template -/system/doc/top/erlresolvelinks.js # test_server |