aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-06-19 17:50:45 +0200
committerSven Gothel <[email protected]>2014-06-19 17:50:45 +0200
commit80335380a644ea37cc618ad1fd49c0ebd076a251 (patch)
treeee5e3cf5fec9a48a325ae79f23c441d45c9d7304
parent799e2c79eac6e45ad16eeffee9194f1a2677b167 (diff)
Minor refinements: .gitignore HowToBuild
-rw-r--r--.gitignore2
-rw-r--r--doc/HowToBuild.html4
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 71e3b7e68..68ebb470a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,5 @@ temp/*
.idea/workspace.xml
.settings/*
**~
-build*
+build*/
make/lib/external/*
diff --git a/doc/HowToBuild.html b/doc/HowToBuild.html
index 17ec97098..f26c673d4 100644
--- a/doc/HowToBuild.html
+++ b/doc/HowToBuild.html
@@ -112,14 +112,14 @@ apt-get install kernel-package build-essential
<pre>
dpkg --add-architecture i386
apt-get update
-apt-get install ia32-libs ia32-libs-gtk gcc-multilib lib32gcc1 lib32gomp1 lib32itm1 lib32quadmath0 libc6-i386 libc6-dev-i386 g++-multilib lib32stdc++6
+apt-get install ia32-libs ia32-libs-gtk gcc-multilib lib32gcc1 lib32gomp1 lib32itm1 lib32quadmath0 libc6-i386 libc6-dev-i386 g++-multilib lib32stdc++6 openjdk-7-jre:i386 openjdk-7-jdk:i386
</pre></li>
<li><b>Debian</b> 8.00
<pre>
dpkg --add-architecture i386
apt-get update
-apt-get install lib32z1 lib32ncurses5 lib32bz2-1.0 gcc-multilib lib32gcc1 lib32gomp1 lib32itm1 lib32quadmath0 libc6-i386 libc6-dev-i386 g++-multilib lib32stdc++6
+apt-get install lib32z1 lib32ncurses5 lib32bz2-1.0 gcc-multilib lib32gcc1 lib32gomp1 lib32itm1 lib32quadmath0 libc6-i386 libc6-dev-i386 g++-multilib lib32stdc++6 openjdk-7-jre:i386 openjdk-7-jdk:i386
</pre></li>
</ul>
</li>