diff options
author | lurchi <lurchi@strangeplace.net> | 2019-06-27 00:40:36 +0200 |
---|---|---|
committer | lurchi <lurchi@strangeplace.net> | 2019-06-27 00:40:36 +0200 |
commit | 970611cb39bbe75a68a1afddd9bb28d6a9a1c057 (patch) | |
tree | 9cb57bc37b9648226952964b93dfdb0d5b4a92fa | |
parent | 4b26c0329a841c9def055d439dae0583fddb3e56 (diff) | |
download | www-970611cb39bbe75a68a1afddd9bb28d6a9a1c057.tar.gz www-970611cb39bbe75a68a1afddd9bb28d6a9a1c057.zip |
add gnutls-bin to dependencies; remove --with-microhttpd option for ubuntu
-rw-r--r-- | template/tutorial-debian9.html.j2 | 6 | ||||
-rw-r--r-- | template/tutorial-ubuntu1804.html.j2 | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/template/tutorial-debian9.html.j2 b/template/tutorial-debian9.html.j2 index 9d34fdfd..03dd8f47 100644 --- a/template/tutorial-debian9.html.j2 +++ b/template/tutorial-debian9.html.j2 | |||
@@ -34,7 +34,11 @@ | |||
34 | </p> | 34 | </p> |
35 | 35 | ||
36 | <code> | 36 | <code> |
37 | $ sudo apt install git libtool autoconf autopoint build-essential libgcrypt-dev libidn11-dev zlib1g-dev libunistring-dev libglpk-dev miniupnpc libextractor-dev libjansson-dev libcurl4-gnutls-dev libsqlite3-dev openssl libnss3-tools | 37 | $ sudo apt install git libtool autoconf autopoint \<br> |
38 | build-essential libgcrypt-dev libidn11-dev zlib1g-dev \<br> | ||
39 | libunistring-dev libglpk-dev miniupnpc libextractor-dev \<br> | ||
40 | libjansson-dev libcurl4-gnutls-dev gnutls-bin libsqlite3-dev \<br> | ||
41 | openssl libnss3-tools libopus-dev libpulse-dev libogg-dev | ||
38 | </code> | 42 | </code> |
39 | 43 | ||
40 | <h3>{{ _("Make an installation directory") }}</h3> | 44 | <h3>{{ _("Make an installation directory") }}</h3> |
diff --git a/template/tutorial-ubuntu1804.html.j2 b/template/tutorial-ubuntu1804.html.j2 index 3f01e7ff..6b2616f9 100644 --- a/template/tutorial-ubuntu1804.html.j2 +++ b/template/tutorial-ubuntu1804.html.j2 | |||
@@ -35,8 +35,9 @@ | |||
35 | $ sudo apt install git libtool autoconf autopoint \<br> | 35 | $ sudo apt install git libtool autoconf autopoint \<br> |
36 | build-essential libgcrypt-dev libidn11-dev zlib1g-dev \<br> | 36 | build-essential libgcrypt-dev libidn11-dev zlib1g-dev \<br> |
37 | libunistring-dev libglpk-dev miniupnpc libextractor-dev \<br> | 37 | libunistring-dev libglpk-dev miniupnpc libextractor-dev \<br> |
38 | libjansson-dev libcurl4-gnutls-dev libsqlite3-dev openssl \<br> | 38 | libjansson-dev libcurl4-gnutls-dev gnutls-bin libsqlite3-dev \<br> |
39 | libnss3-tools libmicrohttpd-dev | 39 | openssl libnss3-tools libmicrohttpd-dev libopus-dev libpulse-dev \<br> |
40 | libogg-dev | ||
40 | </code> | 41 | </code> |
41 | </section> | 42 | </section> |
42 | <section> | 43 | <section> |
@@ -79,7 +80,7 @@ | |||
79 | $ cd ~/gnunet_installation/gnunet<br> | 80 | $ cd ~/gnunet_installation/gnunet<br> |
80 | $ ./bootstrap<br> | 81 | $ ./bootstrap<br> |
81 | $ export GNUNET_PREFIX=/usr<br> | 82 | $ export GNUNET_PREFIX=/usr<br> |
82 | $ ./configure --prefix=$GNUNET_PREFIX --disable-documentation --with-microhttpd=/opt/libmicrohttpd<br> | 83 | $ ./configure --prefix=$GNUNET_PREFIX --disable-documentation |
83 | $ sudo addgroup gnunetdns<br> | 84 | $ sudo addgroup gnunetdns<br> |
84 | $ sudo adduser --system --group --disabled-login --home /var/lib/gnunet gnunet<br> | 85 | $ sudo adduser --system --group --disabled-login --home /var/lib/gnunet gnunet<br> |
85 | $ make -j$(nproc || echo -n 1)<br> | 86 | $ make -j$(nproc || echo -n 1)<br> |