summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorRickard Green <rickard@erlang.org>2018-08-21 17:51:52 +0200
committerRickard Green <rickard@erlang.org>2018-08-21 17:51:52 +0200
commit1b9aae1a5dd812933543615c3c25bd3321ec4061 (patch)
treee952aa3178dc721300d6d1dc2a7db563c24b7f68 /.gitignore
parent9672921fb8afd82cbb449b3a57f2c2f0b4b0e975 (diff)
parentd4b456742b8bdab6222008ffd20e3d086b646e3f (diff)
downloaderlang-1b9aae1a5dd812933543615c3c25bd3321ec4061.tar.gz
Merge branch 'rickard/parallel-configure/OTP-14625'
* rickard/parallel-configure/OTP-14625: Parallel configure Remove undocumented and unused lazy configure
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore7
1 files changed, 5 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 0e9d07757f..cf0da64a43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -171,9 +171,10 @@ JAVADOC-GENERATED
/lib/*/doc/pdf/*.pdf
/lib/*/doc/xml/*.xml
-/lib/configure
/lib/config.log
/lib/config.status
+/make/config.log
+/make/config.status
#
# Files generated by configure.
@@ -186,10 +187,12 @@ JAVADOC-GENERATED
# Files generated by "./otp_build autoconf"
#
+/lib/configure
/lib/*/configure
/lib/common_test/test_server/configure
/lib/configure.in
-/aclocal.m4
+/make/aclocal.m4
+/make/configure
/lib/common_test/priv/auxdir/config.guess
/lib/common_test/priv/auxdir/config.sub
/lib/common_test/priv/auxdir/install-sh