aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2012-12-04 07:18:04 -0800
committerGavin Andresen <gavinandresen@gmail.com>2012-12-04 07:18:04 -0800
commit85887020dc6080e5707632a4ea68232f66d51d69 (patch)
treec8cccaa7bb170527bf21a3817452faa90cb59e9c
parent469e606141a5d0358c91c2a42d40521958a7f748 (diff)
parent2fdd1a8637074e22ae8c3109204d7ecd57a1ff78 (diff)
downloadbitcoin-85887020dc6080e5707632a4ea68232f66d51d69.tar.xz
Merge pull request #2055 from redshark1802/master
more specific build instructions for Ubuntu
-rw-r--r--doc/readme-qt.rst14
1 files changed, 13 insertions, 1 deletions
diff --git a/doc/readme-qt.rst b/doc/readme-qt.rst
index f6adbd8fdd..b0fdd4d810 100644
--- a/doc/readme-qt.rst
+++ b/doc/readme-qt.rst
@@ -8,7 +8,11 @@ Debian
-------
First, make sure that the required packages for Qt4 development of your
-distribution are installed, for Debian and Ubuntu these are:
+distribution are installed, these are
+
+::
+
+for Debian and Ubuntu <= 11.10 :
::
@@ -16,6 +20,14 @@ distribution are installed, for Debian and Ubuntu these are:
libboost-filesystem-dev libboost-program-options-dev libboost-thread-dev \
libssl-dev libdb4.8++-dev
+for Ubuntu >= 12.04 (please read the 'Berkely DB version warning' below):
+
+::
+
+ apt-get install qt4-qmake libqt4-dev build-essential libboost-dev libboost-system-dev \
+ libboost-filesystem-dev libboost-program-options-dev libboost-thread-dev \
+ libssl-dev libdb++-dev libminiupnpc-dev
+
then execute the following:
::